Changeset 5222 in orxonox.OLD

Timestamp:

Sep 23, 2005, 5:42:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: syncing

File:

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

trunk/configure.ac

@@ -72 +72 @@
         AC_HELP_STRING( [--with-shared-lib-path], [Tells the executable, where to look for the shared libraries.]),
          SHARED_LIB_PATH=$enableval)
-
-if test x$SHARED_LIB_PATH = xno; then
+if test x$SHARED_LIB_PATH != xno; then
+        echo "set to $SHARED_LIB_PATH"
+else
         echo "no"
-else 
-        echo $SHARED_LIB_PATH
 fi
 
@@ -100 +99 @@
         echo "yes: setting debuglevel to to $DEBUG"
 fi
-        AC_DEFINE_UNQUOTED(DEBUG, $DEBUG, [in which debug mode we are])
-
+AC_DEFINE_UNQUOTED(DEBUG, $DEBUG, [in which debug mode we are])
 AC_SUBST(DEBUG)
 
@@ -253 +251 @@
 echo "mingw-WINDOWS detected"
 
-CPPFLAGS="-I/usr/include -I/mingw/include"
+CPPFLAGS="-I/usr/include -I/mingw/include $CPPFLAGS"
 
     mingw="yes"
@@ -362 +360 @@
  Linux="yes"
 
-CPPFLAGS="-I/usr/include"
+CPPFLAGS="-I/usr/include $CPPFLAGS" 
 if test x$SHARED_LIB_PATH != xno; then
         echo "setting new LDFlAGS with $SHARED_LIB_PATH"
         LDFLAGS="-Wl,-rpath,$SHARED_LIB_PATH $LDFLAGS"
 fi
-LDFLAGS="-L/usr/lib"
-## LDFLAGS="-L/usr/lib -L$HOME/tmp/lib $LDFLAGS"
+LDFLAGS="-L/usr/lib $LD_FLAGS"
 
 # checking gl header
@@ -390 +387 @@
       [AC_MSG_ERROR([cannot find opengl headers]) ])
 
-    AC_CHECK_LIB([GLU], [main], FOUND_GLU=yes)
-    if test x$FOUND_GLU = xyes ; then
+#    AC_CHECK_LIB([GLU], [main], FOUND_GLU=yes)
+#    if test x$FOUND_GLU = xyes ; then
       LIBS="$LIBS -lGLU"
-    else
-         echo "------------------"
-         echo "GLU library not found."
-         echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org"
-         echo "------------------"
-         exit -1
-    fi
+#    else
+#         echo "------------------"
+#         echo "GLU library not found."
+#         echo "please install the GLU library, that should come with openGL, which can be found at http://www.opengl.org"
+#         echo "------------------"
+#         exit -1
+#    fi
 
 #--------#