Changeset 6164 in orxonox.OLD for trunk

Timestamp:

Dec 19, 2005, 6:44:32 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ac-files for easier checks in the configure.ac

Location:

trunk

Files:

• autogen.sh (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• m4 (added)
• m4/ax_check_lib.m4 (added)

trunk/autogen.sh

@@ -55 +55 @@
 
 #aclocal $ACLOCAL_FLAGS -I ./m4 || exit;
-aclocal-1.9 || aclocal || exit;
+aclocal-1.9 -I m4 || aclocal -I m4 || exit;
 autoheader || exit;
 automake-1.9 --add-missing --copy || automake --add-missing --copy;

trunk/configure.ac

@@ -36 +36 @@
 AC_CONFIG_SRCDIR([./src])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 #########################
@@ -399 +400 @@
 # openGL #
 #--------#
-# checking gl header
-   AC_CHECK_HEADERS([GL/gl.h] ,,
-      [AC_MSG_ERROR([cannot find opengl headers]) ])
-
-#  checking for Unix GL
-   AC_CHECK_LIB([GL], [main], [FOUND_GL=yes; LIBS="$LIBS -lGL"])
-   if test x$FOUND_GL != xyes ; then
-         echo "------------------"
-         echo "opengl not found."
-         echo "please install the opengl package which can be found at http://www.opengl.org"
-         echo "------------------"
-         exit -1
-   fi
-
-# cheking for GLU-header
-    AC_CHECK_HEADERS([GL/glu.h] ,,
-      [AC_MSG_ERROR([cannot find opengl headers]) ])
-    AC_CHECK_LIB([GLU], [main], [FOUND_GLU=yes; LIBS="$LIBS -lGLU"])
-    if test x$FOUND_GLU != xyes ; then
-         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
-
-# checking for GLEW-headers
-   AC_CHECK_HEADERS([GL/glew.h] ,,
-      [AC_MSG_ERROR([cannot find glew headers]) ])
-# checking for GLEW-lib
-  AC_CHECK_LIB([GLEW], [main], [FOUND_GLEW=yes; LIBS="$LIBS -lGLEW"])
-   if test x$FOUND_GLEW != xyes ; then
-         echo "------------------"
-         echo "glew not found."
-         echo "please install the glew package which can be found at http://glew.sourceforge.net"
-         echo "------------------"
-         exit -1
-   fi
+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 #
 #--------#
+
+
 # checking for openAL-headers
   AC_CHECK_HEADERS([AL/al.h] ,,