[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd configure configure.in
From: |
Georg Klein |
Subject: |
[libcvd-members] libcvd configure configure.in |
Date: |
Tue, 24 Oct 2006 12:59:33 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Georg Klein <georgklein> 06/10/24 12:59:33
Modified files:
. : configure configure.in
Log message:
Stop adding spurious -I with no dir, which breaks the AC_CHECK_LIB for
libGL later on.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.72&r2=1.73
Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- configure 10 Oct 2006 18:06:45 -0000 1.74
+++ configure 24 Oct 2006 12:59:32 -0000 1.75
@@ -5972,7 +5972,7 @@
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5980,7 +5980,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -6007,7 +6007,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -6028,11 +6028,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
@@ -6117,7 +6117,12 @@
if test "x$ac_cv_have_x" != x
then
LIBS="-L$x_libraries -lX11 -lXext $LIBS"
+ if test "x$x_includes" != x
+ then
CXXFLAGS="$CXXFLAGS -I$x_includes"
+ fi
+echo LIBS is $LIBS
+echo CXXFLAGS is $CXXFLAGS
echo "$as_me:$LINENO: checking for glDrawPixels in -lGL" >&5
Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- configure.in 10 Oct 2006 18:06:45 -0000 1.72
+++ configure.in 24 Oct 2006 12:59:33 -0000 1.73
@@ -740,7 +740,12 @@
if test "x$ac_cv_have_x" != x
then
LIBS="-L$x_libraries -lX11 -lXext $LIBS"
+ if test "x$x_includes" != x
+ then
CXXFLAGS="$CXXFLAGS -I$x_includes"
+ fi
+echo LIBS is $LIBS
+echo CXXFLAGS is $CXXFLAGS
AC_CHECK_LIB(GL,glDrawPixels)
- [libcvd-members] libcvd configure configure.in,
Georg Klein <=