Move some gettext bits to dxcommon.

[cdecl99.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f0b606f1aebc244e5d21ec5d79570012fe30977c..6a35936a2582ad6da11579ac670a6173ebcc3d4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright © 2011 Nick Bowler
+dnl Copyright © 2011-2012 Nick Bowler
 dnl
 dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 dnl This is free software: you are free to do what the fuck you want to.
@@ -7,7 +7,6 @@ dnl There is NO WARRANTY, to the extent permitted by law.
 AC_PREREQ([2.68])
 AC_INIT([cdecl99], [0.1], [nbowler@draconx.ca])
 AC_CONFIG_HEADER([config.h])
-AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AM_SILENT_RULES([yes])
@@ -19,7 +18,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 +40,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([