Changeset 10876

Timestamp:

Jan 2, 2007, 2:20:49 PM (19 years ago)

Author:

Paul Price

Message:

Adding tests for X11.

File:

• trunk/psModules/configure.ac (modified) (1 diff)

trunk/psModules/configure.ac

@@ -148 +148 @@
 
   if test "$HAVE_KAPA" = "true" -a "$KAPA_LIBS_CONFIG" = "true" ; then
-   AC_MSG_NOTICE([libkapa ldflags info supplied by ohana-config])
-   AC_MSG_CHECKING([libkapa ldflags])
-   KAPA_LIBS="`${KAPA_CONFIG} --libs` -lX11"
-   AC_MSG_RESULT([${KAPA_LIBS}])
+   AC_PATH_X
+   if test "$no_x" = "yes" ; then
+      AC_MSG_WARN([X11 not found: output plots using kapa disabled.  Use --x-includes and --x-libraries if required.])
+      HAVE_KAPA="false"
+   else
+      AC_MSG_NOTICE([libkapa ldflags info supplied by ohana-config])
+      AC_MSG_CHECKING([libkapa ldflags])
+      KAPA_LIBS="`${KAPA_CONFIG} --libs` -L$x_libraries -lX11"
+      KAPA_CFLAGS="${KAPA_CFLAGS} -I$x_includes"
+      AC_MSG_RESULT([${KAPA_LIBS}])
+   fi
   fi
 fi