X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=7e518cbf089170c47c050b9e8e5fdfad0938a36e;hb=b57bac17a6057cc0642e6ecea792e058596f92bb;hp=3975bff3df08465ba940aea8b4daade73516f82c;hpb=722d896a394329ad9da31575439e1a082161fa6b;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index 3975bff3..7e518cbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,72 +1,67 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
-AC_PREREQ(2.58)
-AC_INIT(pspp, 0.3.1,bug-gnu-pspp@gnu.org)
+AX_PREREQ(2.57)
+AC_INIT(pspp, 0.4.2,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(1.9)
 
 dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_RANLIB
+gl_EARLY
+
+PSPP_ENABLE_WARNING(-Wdeclaration-after-statement)
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
 
+PSPP_PERL
+
 dnl Internationalization macros.
 AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION	dnl Prevents autoreconf complaint.
+AM_GNU_GETTEXT_VERSION([0.14.5])
 
 dnl Checks for libraries.
+AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
 AC_CHECK_LIB(m, sin)
-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'))
-
-  
-AC_CHECK_LIB(ncurses, tgetent, LIBS="-lncurses $LIBS" termcap=yes,
-  AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes,
-               termcap=no))
-if test "$termcap" = yes; then
-  AC_CHECK_HEADERS(termcap.h)
-  AC_DEFINE(HAVE_LIBTERMCAP, 1, 
-	[Define if you have the termcap library (-ltermcap).])
-fi
+PSPP_LIBPLOT
+AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
+
 
-AC_CHECK_LIB(readline, readline)
-if test "$ac_cv_lib_readline_readline" = yes; then
-  AC_CHECK_HEADERS(readline/readline.h)
-  AC_CHECK_LIB(readline, add_history, history=yes,
-    AC_CHECK_LIB(history, add_history, LIBS="-lhistory" history=yes,
-                 history=no))
-  if test "$history" = yes; then
-    AC_CHECK_HEADERS(readline/history.h)
-    AC_DEFINE(HAVE_LIBHISTORY, 1,
-	[Define if you have the history library (-lhistory).])
-  fi
+AC_ARG_WITH(gui, [  --without-gui         don't build the PSPPIRE gui])
+
+if test x"$with_gui" != x"no" ; then 
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
+	PKG_CHECK_MODULES(GLADE, libglade-2.0)
 fi
+AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
+
+PSPP_OFF_T
+
+AC_CHECK_LIB(gslcblas,main,,[PSPP_REQUIRED_PREREQ([libgslcblas])])
+AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])])
+
+AC_CHECK_LIB(ncurses, tgetent)
+AC_CHECK_HEADERS(termcap.h)
+
+PSPP_READLINE
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([limits.h memory.h sys/stat.h sys/time.h sys/types.h \
-                  fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.h])
-AC_HEADER_STAT
-AC_HEADER_STDC
-AC_HEADER_TIME
+                  fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.h] )
+
+# For gnulib.
+gl_INIT
 
 AC_C_CONST
 AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
 
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 0)
+dnl  Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
+AC_CHECK_TYPES(off_t) 
 AC_CHECK_SIZEOF(float, 0)
 AC_CHECK_SIZEOF(double, 8)
 AC_CHECK_SIZEOF(long double, 0)
@@ -77,24 +72,14 @@ AC_DEFINE(FPREP_IEEE754, 1,
 
 AC_C_BIGENDIAN
 
-BLP_IS_SPRINTF_GOOD
-BLP_INT_DIGITS
-BLP_RANDOM
-
-AC_FUNC_ALLOCA
-AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
-AC_REPLACE_FUNCS([memmove memset stpcpy strpbrk strerror strtol strtoul \
- 		  memchr getline getdelim strcasecmp strncasecmp memmem \
-		  strtok_r])
-AC_CHECK_FUNCS([gethostname strstr strtod __setfpucw isinf isnan finite \
-		getpid feholdexcept])
+AC_CHECK_FUNCS([strchr strrchr __setfpucw isinf isnan finite getpid feholdexcept])
 
 AC_PROG_LN_S
 
 
-
-AH_BOTTOM([#include <pref.h>])
+AM_CONDITIONAL(unix, test x"$host_os" != x"msdos" )
+AM_CONDITIONAL(msdos, test x"$host_os" = x"msdos" )
 
 dnl This is needed otherwise --with-included-gettext fails
 AH_BOTTOM([#include <locale.h>])
@@ -104,23 +89,10 @@ 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 
-		 lib/Makefile lib/julcal/Makefile lib/misc/Makefile 
-		 lib/dcdflib/Makefile doc/Makefile src/Makefile 
-		 config/Makefile tests/Makefile])
-AC_CONFIG_COMMANDS([pref.h],[
-	   # Copy pref.h from pref.h.orig if prudent
-	   if test ! -f pref.h; then
-	     echo "creating pref.h"
-	     cp $ac_given_srcdir/pref.h.orig pref.h
-	   elif test "`ls -t pref.h.orig pref.h 2>/dev/null | sed 1q`" = pref.h.orig; then
-	     echo "replacing pref.h with newer pref.h.orig"
-	     cp $ac_given_srcdir/pref.h.orig pref.h
-	   else
-	     echo "pref.h exists"
-	   fi
-	   if test -f pref.h; then touch pref.h; fi
-	  ])
+PSPP_CHECK_PREREQS
+
+AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
+
 AC_OUTPUT
 
 dnl configure.ac ends here