Fixed some issues with internationalisation

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 25631a4d87cac9d2a27fd473d7a5dcb8239bf23a..0326d1483f4108bce15d3657e00f0f4d0f03e355 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.58)
-AC_INIT(pspp, 0.3.1)
+AC_INIT(pspp, 0.3.1,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
@@ -10,15 +10,20 @@ dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
 
+AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
+
+
 dnl Internationalization macros.
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION dnl Prevents autoreconf complaint.
 
 dnl Checks for libraries.
 AC_CHECK_LIB(m, sin)
-AC_CHECK_LIB(gmp, mpf_get_str, [LIBS="-lgmp $LIBS"],
-            [AC_CHECK_LIB(gmp, __gmpf_get_str, [LIBS="-lgmp $LIBS"])],
-            AC_MSG_ERROR(`You must install libgmp'))
+AC_CHECK_LIB(gmp, mpf_get_str,,
+       AC_CHECK_LIB(gmp, __gmpf_get_str,,
+          AC_MSG_ERROR([You must install libgmp])
+        )
+)
 
 AC_CHECK_FUNC(getopt_long,,
        AC_MSG_ERROR(`This application depends upon getopt_long'))
@@ -87,22 +92,19 @@ AC_CHECK_FUNCS([gethostname strstr strtod __setfpucw isinf isnan finite \
 
 AC_PROG_LN_S
 
-dnl This must be after other tests so warnings don't provoke errors above.
-if test "$ac_cv_c_compiler_gnu" = yes; then
-       CFLAGS="-g -Wall -W -Wno-uninitialized -Wwrite-strings \
--Wstrict-prototypes -Wpointer-arith -Wno-sign-compare"
-       if test "$CC_OPTIONS" != ""; then
-               CFLAGS="$CFLAGS $CC_OPTIONS"
-       fi
-fi
-AC_SUBST(CFLAGS)
+
 
 AH_BOTTOM([#include <pref.h>])
 
 dnl This is needed otherwise --with-included-gettext fails
 AH_BOTTOM([#include <locale.h>])
 
-AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile intl/Makefile 
+AC_ARG_ENABLE(debug, [  --enable-debug          Turn on diagnostic features in the program])
+if test x"$enable_debug" = x"yes"  ; then
+  AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
+fi
+
+AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile 
                 lib/Makefile lib/julcal/Makefile lib/misc/Makefile 
                 lib/dcdflib/Makefile doc/Makefile src/Makefile 
                 config/Makefile tests/Makefile])
@@ -119,6 +121,6 @@ AC_CONFIG_COMMANDS([pref.h],[
           fi
           if test -f pref.h; then touch pref.h; fi
          ])
-AC_OUTPUT
+AC_OUTPUT(intl/Makefile)
 
 dnl configure.ac ends here