Changeset 9875 in orxonox.OLD

Timestamp:

Oct 3, 2006, 11:30:55 AM (18 years ago)

Author:

bensch

Message:

Linux check in front of Windows check

File:

• trunk/configure.ac (modified) (2 diffs)

trunk/configure.ac

@@ -257 +257 @@
 case "$target" in
 
+
+#########
+#-------#
+# LINUX #
+#-------#
+#########
+ *-*-linux*)
+echo "Linux detected"
+
+ Linux="yes"
+
+##CPPFLAGS="-I/usr/include $CPPFLAGS"
+##LDFLAGS="-L/usr/lib $LDFLAGS"
+if test x$SHARED_LIB_PATH != xno; then
+        echo "setting new LDFLAGS with $SHARED_LIB_PATH"
+        LDFLAGS="-Wl,-rpath,$SHARED_LIB_PATH -L$SHARED_LIB_PATH $LDFLAGS"
+fi
+
+#--------#
+# openGL #
+#--------#
+AX_CHECK_REQUIRED_HEADER_LIB([GL/gl.h], [GL], [main],,, [http://www.opengl.org])
+AX_CHECK_REQUIRED_HEADER_LIB([GL/glu.h], [GLU], [main],,, [http://www.opengl.org])
+AX_CHECK_REQUIRED_HEADER_LIB([GL/glew.h], [GLEW], [main],,, [http://glew.sourceforge.net])
+
+#--------#
+# openAL #
+#--------#
+AX_CHECK_REQUIRED_HEADER_LIB([AL/al.h], [openal], [main],,, [http://www.openal.org])
+
+#-----#
+# SDL #
+#-----#
+# checking for SDL
+  AC_MSG_CHECKING([for SDL-version])
+  SDL_VERSION=`sdl-config --version`
+  echo $SDL_VERSION
+   CPPFLAGS="${CPPFLAGS} `sdl-config --cflags`"
+
+  AX_CHECK_REQUIRED_HEADER_LIB([SDL.h SDL/SDL.h], [SDL], [main],,, [http://www.libsdl.org])
+
+    ;;
+
 ###########
 #---------#
@@ -359 +402 @@
 
   ;;
-
-#########
-#-------#
-# LINUX #
-#-------#
-#########
- *-*-linux*)
-echo "Linux detected"
-
- Linux="yes"
-
-##CPPFLAGS="-I/usr/include $CPPFLAGS"
-##LDFLAGS="-L/usr/lib $LDFLAGS"
-if test x$SHARED_LIB_PATH != xno; then
-        echo "setting new LDFLAGS with $SHARED_LIB_PATH"
-        LDFLAGS="-Wl,-rpath,$SHARED_LIB_PATH -L$SHARED_LIB_PATH $LDFLAGS"
-fi
-
-#--------#
-# openGL #
-#--------#
-AX_CHECK_REQUIRED_HEADER_LIB([GL/gl.h], [GL], [main],,, [http://www.opengl.org])
-AX_CHECK_REQUIRED_HEADER_LIB([GL/glu.h], [GLU], [main],,, [http://www.opengl.org])
-AX_CHECK_REQUIRED_HEADER_LIB([GL/glew.h], [GLEW], [main],,, [http://glew.sourceforge.net])
-
-#--------#
-# openAL #
-#--------#
-AX_CHECK_REQUIRED_HEADER_LIB([AL/al.h], [openal], [main],,, [http://www.openal.org])
-
-#-----#
-# SDL #
-#-----#
-# checking for SDL
-  AC_MSG_CHECKING([for SDL-version])
-  SDL_VERSION=`sdl-config --version`
-  echo $SDL_VERSION
-   CPPFLAGS="${CPPFLAGS} `sdl-config --cflags`"
-
-  AX_CHECK_REQUIRED_HEADER_LIB([SDL.h SDL/SDL.h], [SDL], [main],,, [http://www.libsdl.org])
-
-    ;;
 
 #############