projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug in compare_values_short. Reported by Ben Pfaff.
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index b00a75b14770f824c13737d9182307a347c02546..345ac46bd4569a418458cea29f00066277161388 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-15,6
+15,7
@@
AC_LIBTOOL_WIN32_DLL
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
+m4_pattern_forbid([PKG_CHECK_MODULES])
AC_ARG_ENABLE(
anachronistic-dependencies,
AC_ARG_ENABLE(
anachronistic-dependencies,
@@
-40,14
+41,15
@@
PSPP_LC_PAPER
AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
+AC_ARG_VAR([PSPP_LDFLAGS], [linker flags to be used for linking the pspp binary only])
+AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire binary only])
+
+
AC_ARG_WITH(
gui,
[AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
required_gtk_version=2.12
AC_ARG_WITH(
gui,
[AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
required_gtk_version=2.12
-if test x"$enable_anachronistic_dependencies" = x"yes" ; then
- required_gtk_version=2.8.20
-fi
if test x"$with_gui" != x"no" ; then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,
if test x"$with_gui" != x"no" ; then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,