X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/e7e0b88925cbf72af7c688040d5926ed27113cae..b48ddbe1ee821a75e11675235f83e3e47f2bf923:/configure.ac

diff --git a/configure.ac b/configure.ac
index 67252df..538452f 100644
--- 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,6 +41,7 @@ BISON_I18N
 GLOBAL_SYMBOL_PIPE=$lt_cv_sys_global_symbol_pipe
 AC_SUBST([GLOBAL_SYMBOL_PIPE])
 
+AH_TOP([#include <conf_pre.h>])
 AH_BOTTOM([#include <conf_post.h>])
 
 AC_ARG_WITH([gsl],
@@ -47,18 +49,10 @@ AC_ARG_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([