X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=d62b2bf403dc02e47a53b14c95401a341d7a2047;hb=eda74e68d8966cb3389029d60bf2a902f9e63328;hp=f5fd1e3e39198c39870da6295a7a8659c3cbe6ad;hpb=fcb9e49b2a2d57af7c001ae5d2eda9ac443ba36b;p=pspp

diff --git a/configure.ac b/configure.ac
index f5fd1e3e39..d62b2bf403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
-AC_PREREQ(2.58)
-AC_INIT(pspp, 0.3.1)
+AX_PREREQ(2.57)
+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,15 +92,7 @@ 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>])
 
@@ -107,7 +104,7 @@ 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 intl/Makefile 
+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])
@@ -124,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