Changeset 3399 in orxonox.OLD for orxonox/branches/nico/configure.ac

Timestamp:

Feb 6, 2005, 11:27:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/nico: merged trunk into branches/nico
merged with command:
svn merge ../trunk/ nico/ -r 3238:HEAD
resolved conflict in favor of branches/nico.

Location:

orxonox/branches/nico

Files:

• . (modified) (1 prop)
• configure.ac (modified) (5 diffs)

orxonox/branches/nico/configure.ac

@@ -3 +3 @@
 
 AC_PREREQ(2.56)
-AC_INIT(orxonox, 0.2.0_alpha-r1, orxonox-dev@mail.datacore.ch)
+AC_INIT(orxonox, 0.2.1-pre-alpha, [orxonox-dev at mail.datacore.ch])
 
 # Detect the canonical host and target build environment.
@@ -69 +69 @@
 
 
+### SubProject-enable
+def_sdl_image=yes
+AC_MSG_CHECKING([if the SubProjects should be built])
+AC_ARG_ENABLE([sub-projects], 
+        AC_HELP_STRING( [--enable-sub-projects], 
+        [also builds the subProjects by default]), [def_sub_projects=yes]) 
+if test "$def_sub_projects" = yes; then 
+  echo "yes"
+fi 
+if test "$def_sub_projects" = no; then 
+  echo "no"
+fi
+AM_CONDITIONAL(SUB_PROJECTS, test x$def_sub_projects = xyes)
+
 ## PROGRAMM CHECKING
 # checking for Doxygen
@@ -161 +175 @@
 
 CPPFLAGS="-I/usr/X11R6/include"
-LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
+LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
 # checking gl header
    AC_CHECK_HEADERS(GL/gl.h ,,
@@ -167 +181 @@
 
 #  checking for Unix GL
-   AC_CHECK_LIB([GL], [main], FOUND_GL=yes)
+   AC_CHECK_LIB([GL], [glLoadIdentity], FOUND_GL=yes)
    if test "$FOUND_GL" = "yes" ; then
      LIBS="$LIBS -lGL"
@@ -364 +378 @@
 
 AC_CONFIG_FILES([Makefile
+                 src/Makefile
+                 src/importer/Makefile
                  src/console/Makefile
-                 src/gui/Makefile
-                 src/Makefile
-                 src/importer/Makefile])
+                 src/gui/Makefile])
+
 AC_OUTPUT