More WIN32 portability fixes.

caa99b31 · Christophe Massiot · cb700a8d · caa99b31 · caa99b31
Commit caa99b31 authored Nov 27, 2001 by Christophe Massiot
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 69 additions and 144 deletions

configure configure +46 -103

configure.in configure.in +23 -41

No files found.
--- a/configure
+++ b/configure
--- a/configure.in
+++ b/configure.in
@@ -934,51 +934,33 @@ dnl
 dnl  Windows DirectX module
 dnl
 AC_ARG_ENABLE(directx,
-  [  --disable-directx       Windows DirectX support (default enabled on WIN32)],
+  [  --disable-directx       Windows DirectX support (default enabled on WIN32)])
-  [ if test "x$enableval" != "xno"
+if test "x$enableval" != "xno"
-    then
+then
-      if test "x$enableval" = "xyes"
+  if test $SYS = mingw32
-      then
+  then
-        AC_CHECK_HEADERS(directx.h,
+    AC_ARG_WITH(directx-path, 
-        [ PLUGINS="${PLUGINS} directx"
+    [  --with-directx-path=path Windows DirectX headers and libraries])
-          LIB_DIRECTX="-lgdi32 -ldxguid" ] )
+    if test "x$with_directx_path" = "x"
-      else
-        AC_MSG_CHECKING(for directX headers in ${enableval})
-        if test -f ${enableval}/include/directx.h
-        then
-          PLUGINS="${PLUGINS} directx"
-          LIB_DIRECTX="-L${enableval}/lib -lgdi32 -ldxguid"
-          INCLUDE="${INCLUDE} -I${enableval}/include"
-          AC_MSG_RESULT(yes)
-        else
-          AC_MSG_RESULT(no)
-          AC_MSG_ERROR([Cannot find ${enableval}/include/directx.h!])
-        fi
-      fi
-    fi ],
-  [ if test $SYS = mingw32
    then
-      AC_ARG_WITH(directx-path, 
+      AC_CHECK_HEADERS(directx.h,
-      [  --with-directx-path=path Windows DirectX headers and libraries])
+      [ PLUGINS="${PLUGINS} directx"
-      if test "x$with_directx_path" = "x"
+        LIB_DIRECTX="-lgdi32 -ldxguid" ])
+    else
+      AC_MSG_CHECKING(for directX headers in ${withval})
+      if test -f ${withval}/include/directx.h
      then
-        AC_CHECK_HEADERS(directx.h,
+        PLUGINS="${PLUGINS} directx"
-        [ PLUGINS="${PLUGINS} directx"
+        LIB_DIRECTX="-L${withval}/lib -lgdi32 -ldxguid"
-          LIB_DIRECTX="-lgdi32 -ldxguid" ])
+        INCLUDE="${INCLUDE} -I${withval}/include"
+        AC_MSG_RESULT(yes)
      else
-        AC_MSG_CHECKING(for directX headers in ${withval})
+        AC_MSG_RESULT(no)
-        if test -f ${with_directx_path}/include/directx.h
+        AC_MSG_ERROR([Cannot find ${withval}/include/directx.h!])
-        then
-          PLUGINS="${PLUGINS} directx"
-          LIB_DIRECTX="-L${with_directx_path}/lib -lgdi32 -ldxguid"
-          INCLUDE="${INCLUDE} -I${with_directx_path}/include"
-          AC_MSG_RESULT(yes)
-        else
-          AC_MSG_RESULT(no)
-          AC_MSG_ERROR([Cannot find ${with_directx_path}/include/directx.h!])
-        fi
      fi
-    fi ])
+    fi
+  fi
+fi
 dnl
 dnl  Glide module