[Pspp-cvs] Changes to pspp/configure.ac

[Ben Pfaff]

Index: pspp/configure.ac
diff -u pspp/configure.ac:1.31 pspp/configure.ac:1.32
--- pspp/configure.ac:1.31      Mon Jul 25 03:32:20 2005
+++ pspp/configure.ac   Sun Jul 31 21:42:47 2005
@@ -9,10 +9,12 @@
 dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
+gl_EARLY
 AC_PROG_RANLIB
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
+dnl Check that Perl is available.
 AC_PATH_PROG([PERL], perl, no)
 AC_SUBST([PERL])dnl
 if test "$PERL" = no; then
@@ -24,7 +26,7 @@
 
 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
@@ -39,26 +41,34 @@
 fi
 AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
 
+dnl Check that off_t is defined as an integer type.
+dnl Solaris sometimes declares it as a struct, if it
+dnl thinks that the compiler does not support `long long'.
+AC_COMPILE_IFELSE([#include <sys/types.h>
+#include <unistd.h>
+off_t x = 0;
+int main (void) 
+{ 
+  lseek (0, 1, 2);
+  return 0;
+}], [], [AC_MSG_ERROR(
+[Your system's definition of off_t is broken.  You are probably
+using Solaris.  You can probably fix the problem with
+`--disable-largefile' or `CFLAGS=-ansi'.])])
 
 AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas]))
 AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,
   AC_MSG_ERROR([You must install libgsl version 1.4 or later]))
 
-AC_CHECK_LIB(gnugetopt,getopt_long)
-AC_CHECK_FUNC(getopt_long,,
-       AC_MSG_ERROR(`This application depends upon getopt_long'))
-
 AC_ARG_WITH(ncurses,
 [  --without-ncurses         don't compile in ncurses command line editing])
 
-
 if test "x$with_ncurses" = x"yes"; then 
 AC_CHECK_LIB(ncurses, tgetent, LIBS="-lncurses $LIBS" termcap=yes,
   AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes,
                termcap=no))
 fi
 
-
 if test "$termcap" = yes; then
   AC_CHECK_HEADERS(termcap.h)
   AC_DEFINE(HAVE_LIBTERMCAP, 1, 
@@ -86,18 +96,18 @@
 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
-AC_HEADER_STDBOOL
+# For gnulib.
+gl_LIB(libgl)
+gl_SOURCE_BASE(gl)
+gl_M4_BASE(gl/m4)
+gl_MODULES(alloca alloca-opt assert full-read full-write gethostname getline 
getlogin_r getopt gettext memchr memcmp memmem memmove memset progname readlink 
restrict snprintf stat-macros stdbool stpcpy strcase strcspn strerror strftime 
strstr strtod strtok_r strtol strtoul vsnprintf xalloc xalloc-die xreadlink)
+gl_INIT
 
 AC_C_CONST
 AC_C_INLINE
+
 dnl  Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
 AC_CHECK_TYPES(off_t) 
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-
 AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 4)
@@ -116,14 +126,8 @@
 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 mkdtemp])
+AC_CHECK_FUNCS([strchr strrchr __setfpucw isinf isnan finite getpid 
feholdexcept])
 
 AC_PROG_LN_S
 
@@ -132,7 +136,7 @@
 
 
 AM_CONDITIONAL(unix, test x"$host_os" != x"msdos" )
-AM_CONDITIONAL(msdos, 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>])
@@ -142,8 +146,8 @@
   AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
 fi
 
-AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile 
-                lib/Makefile lib/misc/Makefile lib/gsl-extras/Makefile
+AC_CONFIG_FILES([Makefile m4/Makefile gl/Makefile intl/Makefile po/Makefile.in
+                lib/Makefile lib/gsl-extras/Makefile
                 doc/Makefile 
                 src/Makefile src/expressions/Makefile
                 config/Makefile
@@ -161,6 +165,6 @@
           fi
           if test -f pref.h; then touch pref.h; fi
          ])
-AC_OUTPUT(intl/Makefile)
+AC_OUTPUT
 
 dnl configure.ac ends here