projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added autoconf check for msgfmt
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 9ce769983377b1b4809cc99e91d24fda69d0d865..b553d2dcd0c2aa200f9c81049248f7dd0de9c903 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,7
+2,7
@@
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
AC_PREREQ(2.63)
dnl Initialize.
AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [0.
9.0
], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.
10.4
], [bug-gnu-pspp@gnu.org], [pspp])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
@@
-32,6
+32,11
@@
dnl Disable automatic po/ support, because PSPP provides its own po/ support.
AC_PROVIDE([AM_PO_SUBDIRS])
AM_GNU_GETTEXT([external], [need-ngettext])
LIBS="$LIBINTL $LIBS"
AC_PROVIDE([AM_PO_SUBDIRS])
AM_GNU_GETTEXT([external], [need-ngettext])
LIBS="$LIBINTL $LIBS"
+AC_CHECK_PROGS([MSGFMT], [msgfmt])
+if test "x$MSGFMT" = x; then
+ PSPP_REQUIRED_PREREQ([msgfmt (is usually provided with gettext)])
+fi
+
dnl Checks for libraries.
AC_SYS_LARGEFILE
dnl Checks for libraries.
AC_SYS_LARGEFILE
@@
-60,7
+65,7
@@
fi
dnl Xmllint is used in the rules to build the documentation. It is not actually necessary,
dnl but is used for post-build consistency checks. Thus, non-developers can live without it.
dnl Xmllint is used in the rules to build the documentation. It is not actually necessary,
dnl but is used for post-build consistency checks. Thus, non-developers can live without it.
-dnl However for it to be useful
l
, it needs to be a certain version and have certain features.
+dnl However for it to be useful, it needs to be a certain version and have certain features.
dnl The macros below check that it the xmllint available is up to scratch. If it isn't
dnl then a dummy /bin/echo is subsituted instead.
dnl The macros below check that it the xmllint available is up to scratch. If it isn't
dnl then a dummy /bin/echo is subsituted instead.
@@
-84,8
+89,8
@@
if test "$with_cairo" != no && test "$with_gui" != "no"; then
PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
[PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])])
PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
[PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])])
- PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.
4.2
], [],
- [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.
4.2
or later (or use --without-gui)])])
+ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.
14.5
], [],
+ [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.
14.5
or later (or use --without-gui)])])
PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
[PSPP_REQUIRED_PREREQ([gtksourceview 3.0 version 3.4.2 or later (or use --without-gui)])])
PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
[PSPP_REQUIRED_PREREQ([gtksourceview 3.0 version 3.4.2 or later (or use --without-gui)])])
@@
-99,6
+104,11
@@
if test "$with_cairo" != no && test "$with_gui" != "no"; then
PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
fi
PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
fi
+ AC_CHECK_PROGS([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
+ if test "x$GLIB_COMPILE_RESOURCES" = x; then
+ PSPP_REQUIRED_PREREQ([glib-compile-resources (or use --without-gui)])
+ fi
+
fi
gl_NEXT_HEADERS([gtk/gtk.h])
fi
gl_NEXT_HEADERS([gtk/gtk.h])
@@
-306,7
+316,7
@@
PSPP_READLINE
dnl Checks for header files.
AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h pwd.h])
dnl Checks for header files.
AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h pwd.h])
-dnl Some systems dont have SIGWINCH
+dnl Some systems don
'
t have SIGWINCH
AC_CHECK_DECLS([SIGWINCH], [], [],
[#include <signal.h>
/* NetBSD declares sys_siglist in unistd.h. */
AC_CHECK_DECLS([SIGWINCH], [], [],
[#include <signal.h>
/* NetBSD declares sys_siglist in unistd.h. */