Rewrite expression code.

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dbdfa543e5368523d00ec1495dd2d924b793ebe8..55065328ba470ab16f12e2adbd4cf3f96c5ba9cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,14 @@ AC_PROG_CC
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
-
+AC_PATH_PROG([PERL], perl, no)
+AC_SUBST([PERL])dnl
+if test "$PERL" = no; then
+  AC_MSG_ERROR([perl is not found])
+fi
+$PERL -e 'require 5.005_03;' || {
+   AC_MSG_ERROR([Perl 5.005_03 or better is required])
+}
 
 dnl Internationalization macros.
 AM_GNU_GETTEXT
@@ -22,6 +29,16 @@ dnl Checks for libraries.
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_CHECK_LIB(m, sin)
+AC_ARG_WITH(libplot, [  --without-libplot         don't compile in support of charts (using libplot)])
+
+if test x"$with_libplot" != x"no" ; then 
+       AC_CHECK_LIB(plot, pl_newpl_r,,
+         AC_MSG_ERROR([You must install libplot (or use --without-libplot)])
+       )
+fi
+AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
+
+
 AC_CHECK_LIB(gmp, mpf_get_str,,
        AC_CHECK_LIB(gmp, __gmpf_get_str,,
           AC_MSG_ERROR([You must install libgmp])
@@ -67,15 +84,22 @@ if test "$ac_cv_lib_readline_readline" = yes; then
 fi
 
 dnl Checks for header files.
+AC_ARG_WITH(valgrind, [  --without-valgrind        don't compile in valgrind])
+if test "x$with_valgrind" != x"no"; then 
+ AC_CHECK_HEADERS([valgrind/valgrind.h])
+fi
 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 \
-                 valgrind/valgrind.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
 
 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
 
@@ -124,9 +148,11 @@ if test x"$enable_debug" = x"yes"  ; then
 fi
 
 AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile 
-                lib/Makefile lib/julcal/Makefile lib/misc/Makefile 
-                doc/Makefile src/Makefile 
-                config/Makefile tests/Makefile])
+                lib/Makefile lib/misc/Makefile 
+                doc/Makefile 
+                src/Makefile src/expressions/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