From: John Darrington Date: Fri, 18 Dec 2009 19:34:12 +0000 (+0100) Subject: Merge branch 'master' into output X-Git-Tag: fc11-i386-build61^0 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c08a6e1009cf60847e770a77a73c650e9326379;p=pspp-builds.git Merge branch 'master' into output Conflicts: NEWS configure.ac src/output/charts/dummy-chart.c --- 7c08a6e1009cf60847e770a77a73c650e9326379 diff --cc configure.ac index 499128b3,1ef538bc..1dc8e558 --- a/configure.ac +++ b/configure.ac @@@ -40,7 -40,10 +40,8 @@@ f dnl Checks for libraries. AC_SYS_LARGEFILE AC_SEARCH_LIBS([sin], [m]) + AC_SEARCH_LIBS([dcgettext], [intl]) -PSPP_LIBPLOT PSPP_LC_PAPER -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])