[mapserver-commits] r11140 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-03-10 08:11:36 -0800 (Thu, 10 Mar 2011)
New Revision: 11140

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Look for OpenGL libs under /usr/lib64 as well (#3724)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-10 03:24:22 UTC (rev 11139)
+++ trunk/mapserver/HISTORY.TXT	2011-03-10 16:11:36 UTC (rev 11140)
@@ -14,8 +14,10 @@
 Current Version (SVN trunk):
 ----------------------------
 
-- ...
+- Fixed --with-opengl build issue: Look for OpenGL libs under /usr/lib64 as 
+  well (#3724)
 
+
 Version 6.0.0-beta1 (2011-03-09)
 --------------------------------
 

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2011-03-10 03:24:22 UTC (rev 11139)
+++ trunk/mapserver/configure	2011-03-10 16:11:36 UTC (rev 11140)
@@ -9912,10 +9912,11 @@
   fi
 
   test -f $OGL_DIR/lib/libGL.so -a -f $OGL_DIR/lib/libGLU.so && OGL_LIBDIR="$OGL_DIR/lib"
+  test -f $OGL_DIR/lib64/libGL.so -a -f $OGL_DIR/lib64/libGLU.so && OGL_LIBDIR="$OGL_DIR/lib64"
 
   if test -z "$OGL_LIBDIR" ; then
-      { { echo "$as_me:$LINENO: error: \"could not find libGL or libGLU in $OGL_DIR/lib/.\"" >&5
-echo "$as_me: error: \"could not find libGL or libGLU in $OGL_DIR/lib/.\"" >&2;}
+      { { echo "$as_me:$LINENO: error: \"could not find libGL or libGLU in $OGL_DIR/lib/ or $OGL_DIR/lib64/.\"" >&5
+echo "$as_me: error: \"could not find libGL or libGLU in $OGL_DIR/lib/ or $OGL_DIR/lib64/.\"" >&2;}
    { (exit 1); exit 1; }; }
   fi
 

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2011-03-10 03:24:22 UTC (rev 11139)
+++ trunk/mapserver/configure.in	2011-03-10 16:11:36 UTC (rev 11140)
@@ -950,9 +950,10 @@
   fi
   
   test -f $OGL_DIR/lib/libGL.so -a -f $OGL_DIR/lib/libGLU.so && OGL_LIBDIR="$OGL_DIR/lib"
+  test -f $OGL_DIR/lib64/libGL.so -a -f $OGL_DIR/lib64/libGLU.so && OGL_LIBDIR="$OGL_DIR/lib64"
    
   if test -z "$OGL_LIBDIR" ; then
-      AC_MSG_ERROR("could not find libGL or libGLU in $OGL_DIR/lib/.")
+      AC_MSG_ERROR("could not find libGL or libGLU in $OGL_DIR/lib/ or $OGL_DIR/lib64/.")
   fi