[libcvd-members] libcvd configure configure.in

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        06/07/31 14:42:18

Modified files:
        .              : configure configure.in 

Log message:
        FreeBSD fixes: GL is in the X path, not /usr, so this is now added 
before
        GL is tested for. Also GL.so is misconfigured, so -lX11 and -lXext 
(both)
        must be added manually.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.69&r2=1.70

Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- configure   31 Jul 2006 14:33:39 -0000      1.71
+++ configure   31 Jul 2006 14:42:18 -0000      1.72
@@ -6114,6 +6114,13 @@
 fi
 
 
+save_CXXFLAGS="$CXXFLAGS"
+save_LIBS="$LIBS"
+if test "x$ac_cv_have_x" != x
+then
+       LIBS="-L$x_libraries -lX11 -lXext $LIBS"
+       CXXFLAGS="$CXXFLAGS -I$x_includes"
+
 
 echo "$as_me:$LINENO: checking for glDrawPixels in -lGL" >&5
 echo $ECHO_N "checking for glDrawPixels in -lGL... $ECHO_C" >&6
@@ -6189,8 +6196,8 @@
 fi
 
 
-if test "x$ac_cv_have_x" != x && test "$ac_cv_lib_GL_glDrawPixels" != no
-then
+       if test "$ac_cv_lib_GL_glDrawPixels" != no
+       then
        cat >>confdefs.h <<\_ACEOF
 #define CVD_HAVE_VIDEODISPLAY 1
 _ACEOF
@@ -6198,9 +6205,11 @@
        options="$options videodisplay"
        have_videodisplay=yes
 
-       LIBS="-lX11 -lGL $LIBS"
-       test -n "$x_libraries" && LIBS="-L$x_libraries $LIBS"
-       test -n "$x_includes" && CPPFLAGS="$CPPFLAGS -I$x_includes"
+               LIBS="-lGL $LIBS"
+       else
+               LIBS="$save_LIBS"
+               CXXFLAGS="$CXXFLAGS"
+       fi
 fi
 
 

Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- configure.in        31 Jul 2006 14:33:39 -0000      1.69
+++ configure.in        31 Jul 2006 14:42:18 -0000      1.70
@@ -736,16 +736,25 @@
 
 AC_PATH_X
 
-AC_CHECK_LIB(GL,glDrawPixels)
-
-if test "x$ac_cv_have_x" != x && test "$ac_cv_lib_GL_glDrawPixels" != no
+save_CXXFLAGS="$CXXFLAGS"
+save_LIBS="$LIBS"
+if test "x$ac_cv_have_x" != x
 then
+       LIBS="-L$x_libraries -lX11 -lXext $LIBS"
+       CXXFLAGS="$CXXFLAGS -I$x_includes"
+
+       AC_CHECK_LIB(GL,glDrawPixels)
+
+       if test "$ac_cv_lib_GL_glDrawPixels" != no
+       then
        AC_DEFINE(CVD_HAVE_VIDEODISPLAY)
        options="$options videodisplay"
        AC_SUBST(have_videodisplay, yes)
-       LIBS="-lX11 -lGL $LIBS"
-       test -n "$x_libraries" && LIBS="-L$x_libraries $LIBS"
-       test -n "$x_includes" && CPPFLAGS="$CPPFLAGS -I$x_includes"
+               LIBS="-lGL $LIBS"
+       else
+               LIBS="$save_LIBS"
+               CXXFLAGS="$CXXFLAGS"
+       fi
 fi
 
 AC_ARG_WITH(threads, [  --without-threads       compile without PThread 
support],[if test "$withval" = no; then disable_threads=yes; else 
disable_threads=no; fi])