Changeset 2189 in orxonox.OLD for orxonox/branches/chris/configure.ac

Timestamp:

Jul 17, 2004, 10:57:20 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches/chris: now it configures the right values for Linux&Winodws.

File:

• orxonox/branches/chris/configure.ac (modified) (4 diffs)

orxonox/branches/chris/configure.ac

@@ -11 +11 @@
 case `uname` in
   *MINGW*)
-    mingw=yes
+    mingw="yes"
     MSBITFIELDS="-mms-bitfields"
     MWINDOWS="-mwindows"
     ;;
   *)
-    mingw=no
+    mingw="no"
     ;;
 esac
@@ -104 +104 @@
 fi
 
+## mingw CHECK
+if test $mingw = yes ; then
+        AC_CHECK_LIB([mingw32], [main], FOUND_mingw32=yes)
+        if test $FOUND_mingw32 = "yes"; then 
+                LIBS="$LIBS -lmingw32"
+        fi
+fi
+
 ## SDL CHECK
 
@@ -109 +117 @@
 AC_CHECK_HEADERS(SDL/SDL.h ,,
       [AC_MSG_ERROR([cannot find SDL headers]) ])
-
-AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)
-if test "$FOUND_SDL" = "yes" ; then
-    LIBS="$LIBS -lSDL"
-    #   checking for Windows sdl library
+if test $mingw = no ; then
+        AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)
+        if test "$FOUND_SDL" = "yes" ; then
+                LIBS="$LIBS -lSDL"
+        fi
+#   checking for Windows sdl library
 else
-    echo "We did not find the Linux sdl Library. Checking for Windows Library"
     AC_CHECK_LIB([sdlmain], [main], FOUND_sdlmain=yes)
     if test "$FOUND_sdlmain" = "yes" ; then
-        LIBS="$LIBS -lsdlmain -lsdl"
-    else
-         echo "------------------"
-         echo "sdl library not found."
-         echo "please install the libsdl, which can be found at http://www.libsdl.org"
-         echo "------------------"
-         exit -1
+        LIBS="$LIBS -lsdlmain"
     fi
+        AC_CHECK_LIB([sdl], [main], FOUND_sdl=yes)
+        if test "$FOUND_sdl" = "yes" ; then
+                LIBS="$LIBS -lsdl"
+        fi
 fi
 
@@ -133 +139 @@
     LIBS="$LIBS -lpthread"
 fi
-
-#checking for  libs
-AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
-if test "$FOUND_pthread" = "yes" ; then
-    LIBS="$LIBS -lpthread"
-fi
-