dnl Summarize all the missing prerequisites at the end of the run to
dnl increase user-friendliness.
-AC_DEFUN([PSPP_REQUIRED_PREREQ],
+AC_DEFUN([PSPP_REQUIRED_PREREQ],
[AC_MSG_WARN([You must install $1 before building PSPP.])
pspp_required_prereqs="$pspp_required_prereqs
$1"])
AC_DEFUN([PSPP_OPTIONAL_PREREQ], [pspp_optional_prereqs="$pspp_optional_prereqs
$1"])
-AC_DEFUN([PSPP_CHECK_PREREQS],
+AC_DEFUN([PSPP_CHECK_PREREQS],
[
if test "$pspp_optional_prereqs" != ""; then
- AC_MSG_WARN([The following optional prerequisites are not installed.
+ AC_MSG_WARN([The following optional packages are not installed.
You may wish to install them to obtain additional functionality:$pspp_optional_prereqs])
fi
if test "$pspp_required_prereqs" != ""; then
- AC_MSG_ERROR([The following required prerequisites are not installed.
+ AC_MSG_ERROR([The following required packages are not installed.
You must install them before PSPP can be built:$pspp_required_prereqs])
fi
])
-
+
dnl Check that a new enough version of Perl is available.
AC_DEFUN([PSPP_PERL],
AC_DEFUN([PSPP_CHECK_CC_OPTION],
[
m4_define([pspp_cv_name], [pspp_cv_[]m4_translit([$1], [-], [_])])dnl
- AC_CACHE_CHECK([whether $CC accepts $1], [pspp_cv_name],
+ AC_CACHE_CHECK([whether $CC accepts $1], [pspp_cv_name],
[pspp_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $1"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,)], [pspp_cv_name[]=yes], [pspp_cv_name[]=no])
])
if test "$gl_cv_lib_readline" = yes; then
- AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.])
+ AC_DEFINE([HAVE_READLINE], 1, [Define if you have the readline library.])
AC_MSG_CHECKING([how to link with libreadline])
AC_MSG_RESULT([$LIBREADLINE])
AC_SEARCH_LIBS([rl_echo_signal_char], [readline],
- AC_DEFINE(HAVE_RL_ECHO_SIGNAL_CHAR, 1, [Define if the readline library provides rl_echo_signal_char.]),[],[$LIBREADLINE])
+ AC_DEFINE([HAVE_RL_ECHO_SIGNAL_CHAR], 1, [Define if the readline library provides rl_echo_signal_char.]),[],[$LIBREADLINE])
AC_SEARCH_LIBS([rl_outstream], [readline],
- AC_DEFINE(HAVE_RL_OUTSTREAM, 1, [Define if the readline library provides rl_outstream.]),[],[$LIBREADLINE])
+ AC_DEFINE([HAVE_RL_OUTSTREAM], 1, [Define if the readline library provides rl_outstream.]),[],[$LIBREADLINE])
else
dnl If $LIBREADLINE didn't lead to a usable library, we don't
dnl need $INCREADLINE either.
rm -f conftest*
test x"${pspp_cv_build_exeext}" = x && pspp_cv_build_exeext=no])
EXEEXT_FOR_BUILD=""
- test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeex
-t}
+ test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeext}
fi
AC_SUBST(EXEEXT_FOR_BUILD)])
[pspp_cv_lc_paper=yes])
])
if test "$pspp_cv_lc_paper" = yes; then
- AC_DEFINE(HAVE_LC_PAPER, 1, [Define if you have LC_PAPER.])
+ AC_DEFINE([HAVE_LC_PAPER], 1, [Define if you have LC_PAPER.])
fi
])
AC_CONFIG_COMMANDS_PRE(
[if test "X$enable_Werror" = Xyes; then
CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations"
+ # gnulib needs this, for now:
+ CFLAGS="$CFLAGS -Wno-error=attributes"
fi])])
# The following comes from Open vSwitch: