Changeset 3385 in orxonox.OLD

Timestamp:

Jan 27, 2005, 2:05:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added new include directory for openGL. now it works with the new xorg.

Location:

orxonox/trunk

Files:

• configure (modified) (5 diffs)
• configure.ac (modified) (2 diffs)

orxonox/trunk/configure

@@ -4905 +4905 @@
 
 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
 
@@ -5063 +5063 @@
 
 #  checking for Unix GL
-   echo "$as_me:$LINENO: checking for main in -lGL" >&5
-echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6
-if test "${ac_cv_lib_GL_main+set}" = set; then
+   echo "$as_me:$LINENO: checking for glLoadIdentity in -lGL" >&5
+echo $ECHO_N "checking for glLoadIdentity in -lGL... $ECHO_C" >&6
+if test "${ac_cv_lib_GL_glLoadIdentity+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5077 +5077 @@
 /* end confdefs.h.  */
 
-
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char glLoadIdentity ();
 int
 main ()
 {
-main ();
+glLoadIdentity ();
   ;
   return 0;
@@ -5108 +5114 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_GL_main=yes
+  ac_cv_lib_GL_glLoadIdentity=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_GL_main=no
+ac_cv_lib_GL_glLoadIdentity=no
 fi
 rm -f conftest.err conftest.$ac_objext \
@@ -5119 +5125 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
-echo "${ECHO_T}$ac_cv_lib_GL_main" >&6
-if test $ac_cv_lib_GL_main = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glLoadIdentity" >&5
+echo "${ECHO_T}$ac_cv_lib_GL_glLoadIdentity" >&6
+if test $ac_cv_lib_GL_glLoadIdentity = yes; then
   FOUND_GL=yes
 fi

orxonox/trunk/configure.ac

@@ -175 +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 ,,
@@ -181 +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"