X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=cb5b4c58f814f4a3d879f7fc142e4e8bb12694ec;hb=7ee429e606ed6e711cf8ddd10143e6e9e6bd0dd0;hp=14436fed7617a6f30e8b1b9682f7b8bef8fe156b;hpb=8cd2dcd874841a5a7a64a42f76ee9d1fae5718ad;p=pspp-builds.git diff --git a/configure.ac b/configure.ac index 14436fed..cb5b4c58 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Initialize. AX_PREREQ(2.60) -AC_INIT(pspp, 0.4.2,bug-gnu-pspp@gnu.org) +AC_INIT(pspp, 0.4.3,bug-gnu-pspp@gnu.org) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE @@ -15,7 +15,6 @@ AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL PSPP_ENABLE_OPTION(-Wdeclaration-after-statement) -PSPP_ENABLE_OPTION(-mieee) AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" ) @@ -37,14 +36,16 @@ AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no") AC_ARG_WITH(gui, [ --without-gui don't build the PSPPIRE gui]) 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) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0,, + [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.8.0 or later (or use --without-gui)])]) + PKG_CHECK_MODULES(GLADE, libglade-2.0,, + [PSPP_REQUIRED_PREREQ([libglade 2.0 (or use --without-gui)])]) fi AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no") AC_ARG_WITH(gui_tools, [ --with-gui-tools build the gui developer tools]) if test x"$with_gui_tools" = x"yes" ; then - PKG_CHECK_MODULES(GLADE_UI, libgladeui-1.0) + PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0) fi AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")