X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=f0895ce20564d883311855baedbf47069e2b662a;hb=b7ed8e443a19d63b8bd444fa805cfc9eda1bc3f0;hp=022574d152cda5ebbb67ab7f480b24920f94ec0f;hpb=3d4d87faafee668d269b5345966b89b21c66d279;p=pspp diff --git a/configure.ac b/configure.ac index 022574d152..f0895ce205 100644 --- a/configure.ac +++ b/configure.ac @@ -30,22 +30,23 @@ AC_SYS_LARGEFILE AC_FUNC_FSEEKO AC_CHECK_LIB(m, sin) PSPP_LIBPLOT +PSPP_LC_PAPER 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,, - [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.6.0 or later (or use --without-gui)])]) - 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 >= 2.6.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") @@ -104,5 +105,6 @@ PSPP_CHECK_PREREQS AC_CONFIG_FILES([Makefile gl/Makefile po/Makefile.in]) AC_OUTPUT +echo "PSPP configured successfully." dnl configure.ac ends here