Mercurial > hg > octave-lyh

changeset 8770:af676d09da08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test for X11 if "--without-x" is given.
author Thomas Treichl <Thomas.Treichl@gmx.net>
date Tue, 17 Feb 2009 00:27:30 -0500
parents a186c5b4f264
children d3382daaf4d2
files ChangeLog configure.in
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-17  Thomas Treichl  <Thomas.Treichl@gmx.net>
+
+	* configure.in: Fix test for X11 if "--without-x" is given.
+
 2009-02-16  Jaroslav Hajek  <highegg@gmail.com>
 
 	* NEWS: Yet more updates.
--- a/configure.in
+++ b/configure.in
@@ -264,10 +264,17 @@
 if test "$have_x"; then
   AC_DEFINE(HAVE_X_WINDOWS, 1, [Define if you have X11])
 
-  X11_INCFLAGS="$x_includes"
+  if test $x_includes != "NONE"; then
+    X11_INCFLAGS="$x_includes"
+  fi
   AC_SUBST(X11_INCFLAGS)
 
-  AC_CHECK_LIB(X11, XrmInitialize, [X11_LIBS=-lX11], [X11_LIBS=])
+  if test -z $x_libraries; then
+    AC_CHECK_LIB(X11, XrmInitialize, [X11_LIBS=-lX11], [X11_LIBS=])
+  elif test $x_libraries != "NONE"; then
+    AC_CHECK_LIB(X11, XrmInitialize, 
+      [X11_LIBS="-L$x_libraries -lX11"], [X11_LIBS=], "-L$x_libraries")
+  fi
   AC_SUBST(X11_LIBS)
 fi