X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=69836f9599a09e14ae4b8645cf05f381cfd26f4e;hb=180d764e86e0f3b2fd0e2bb613d790adcd5aceb0;hp=49f3a0b321a88051c1bc9c080cc351ac492efb0c;hpb=72318eac4782acf0215da8dfd4575ac66a9a9f74;p=pspp

diff --git a/configure.ac b/configure.ac
index 49f3a0b321..69836f9599 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,10 +9,18 @@ AM_INIT_AUTOMAKE
 dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
+AC_PROG_RANLIB
 
 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
@@ -77,16 +85,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
-AC_TYPE_OFF_T
+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
 
@@ -135,9 +149,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