From a93282aa572ad484167d9d4205402197f8a42512 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Wed, 16 Feb 2011 19:41:27 -0800 Subject: [PATCH] updated configure.ac to check for Xaw header files check for Xaw header files when --without-Xaw3d was given. Before the test was only done when Xaw3d was specified, but could not be found. If Xaw3d or Xaw can't be found, print a hopefully useful error message and exit the configure script. --- configure.ac | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 611dd18..6cc9d93 100644 --- a/configure.ac +++ b/configure.ac @@ -131,12 +131,15 @@ if test "$xt" = "no" ; then exit 1 fi -dnl | test if user wants ot use Xaw3d headers +dnl | test if user wants ot use Xaw3d or Xaw + +dnl | add configure option for Xaw3d AC_ARG_WITH([Xaw3d], [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d instead of Xaw])], [], [with_Xaw3d=no]) +dnl | check availability of Xaw3d XAW_LIBS= AS_IF([test x"$with_Xaw3d" != x"no"], [AC_CHECK_LIB([Xaw3d], @@ -144,21 +147,19 @@ AS_IF([test x"$with_Xaw3d" != x"no"], [AC_SUBST([XAW_LIBS],["-lXaw3d"]) AC_DEFINE([USE_XAW3D], [1], [Define if you want to use Xaw3d])], - [AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes") - AC_MSG_FAILURE( - [--with-Xaw3d was given, but test for Xaw3d failed])], + [AC_MSG_ERROR([--with-Xaw3d was given, but test for Xaw3d failed. Make sure that you have Xaw3d installed, else you might want to try the configure option --without-Xaw3d])], [-lXaw])]) +dnl | no Xaw3d, check for Xaw if test x"$with_Xaw3d" = x"no" ; then + AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes", xaw_headers="no") + if test x"$xaw_headers" = x"no" ; then + AC_MSG_ERROR([Xaw headers not found. Please install the Xaw package and headers.]) + fi XAW_LIBS="-lXaw" fi AC_SUBST(XAW_LIBS) -dnl | end Xaw3d test - -if test x"$xaw_headers" = x"no" ; then - echo Xaw headers not found - exit 1 -fi +dnl | end Xaw/Xaw3d test AC_CANONICAL_HOST -- 1.7.0.4