Make fix-gnulib only need a single output file.

[cdecl99.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f0b606f1aebc244e5d21ec5d79570012fe30977c..538452ff5c464f1c3b31fa256a6c3e0af34c2c32 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,8 @@ gl_EARLY
 LT_INIT
 gl_INIT
 
-DX_FIX_GNULIB([cdecl__])
+m4_include([lib/gnulib.mk])
+DX_GLSYM_PREFIX([cdecl__])
 
 dnl We provide our own makefile rules for gettext.  Disable tracing of
 dnl AM_GNU_GETTEXT to prevent autoreconf from running autopoint, and to
@@ -40,25 +41,18 @@ BISON_I18N
 GLOBAL_SYMBOL_PIPE=$lt_cv_sys_global_symbol_pipe
 AC_SUBST([GLOBAL_SYMBOL_PIPE])
 
-AH_BOTTOM([#include <cfgtail.h>])
+AH_TOP([#include <conf_pre.h>])
+AH_BOTTOM([#include <conf_post.h>])
 
 AC_ARG_WITH([gsl],
        [AS_HELP_STRING([--with-gsl],
                [specify whether to build test programs requiring the GNU Scientific Library. [default=auto]]
        )], [with_gsl=$withval], [with_gsl=auto])
 
-case $with_gsl in
-no)
-       have_gsl=no
-;;
-yes)
-       DX_CHECK_GSL([1.0], [have_gsl=yes])
-;;
-*)
-       DX_CHECK_GSL([1.0], [have_gsl=yes], [have_gsl=no])
-;;
-esac
-
+AS_CASE([$with_gsl],
+       [no], [have_gsl=no],
+       [yes], [DX_CHECK_GSL([1.0], [have_gsl=yes])],
+       [DX_CHECK_GSL([1.0], [have_gsl=yes], [have_gsl=no])])
 AM_CONDITIONAL([HAVE_GSL], [test x"$have_gsl" = x"yes"])
 
 AC_CONFIG_FILES([