X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=ff5d3f00c089ca602173d875e1795aff2fa7f4db;hb=bf291e2e75c098fc34d3a254becaac9d3cad5a82;hp=55065328ba470ab16f12e2adbd4cf3f96c5ba9cf;hpb=d807ad29cc0d3caa4f0e04ee4b75c70a225cfeaf;p=pspp-builds.git diff --git a/configure.ac b/configure.ac index 55065328..ff5d3f00 100644 --- a/configure.ac +++ b/configure.ac @@ -1,17 +1,22 @@ -dnl Process this file with autoconf to produce a configure script. +0dnl Process this file with autoconf to produce a configure script. dnl Initialize. AX_PREREQ(2.57) -AC_INIT(pspp, 0.3.1,bug-gnu-pspp@gnu.org) +AC_INIT(pspp, 0.4.1,bug-gnu-pspp@gnu.org) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE dnl Checks for programs. AC_GNU_SOURCE AC_PROG_CC +AM_PROG_CC_C_O +AC_PROG_RANLIB +gl_EARLY 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 @@ -23,7 +28,7 @@ $PERL -e 'require 5.005_03;' || { 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 @@ -33,76 +38,57 @@ AC_ARG_WITH(libplot, [ --without-libplot don't compile in support of ch 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)]) + AC_MSG_ERROR([You must install libplot development libraries (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]) - ) -) - -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]) +AC_ARG_WITH(gui, [ --without-gui don't build the PSPPIRE gui]) - -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)) +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") + + +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 +#include +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 development libraries])) +AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,, + AC_MSG_ERROR([You must install development libraries for libgsl version 1.4 or later])) +AC_CHECK_LIB(ncurses, tgetent) +AC_CHECK_HEADERS(termcap.h) -if test "$termcap" = yes; then - AC_CHECK_HEADERS(termcap.h) - AC_DEFINE(HAVE_LIBTERMCAP, 1, - [Define if you have the termcap library (-ltermcap).]) -fi - -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 -fi +PSPP_READLINE 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] ) -AC_HEADER_STAT -AC_HEADER_STDC -AC_HEADER_TIME -AC_HEADER_STDBOOL +# For gnulib. +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) @@ -117,27 +103,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 mkdtemp]) +AC_CHECK_FUNCS([strchr strrchr __setfpucw isinf isnan finite getpid feholdexcept]) AC_PROG_LN_S -AH_BOTTOM([#include ]) - - 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 ]) @@ -147,25 +120,8 @@ 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 - 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 - 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 - ]) -AC_OUTPUT(intl/Makefile) +AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in]) + +AC_OUTPUT dnl configure.ac ends here