summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1998-02-02 15:36:06 +0100
committerWerner Koch <wk@gnupg.org>1998-02-02 15:36:06 +0100
commitc8f12e218f81f9211920b6fe50a786b617a2aeae (patch)
treed042319be043090b02df4396c9880398b2b831ea /configure.in
parentauf tobold (diff)
downloadgnupg2-c8f12e218f81f9211920b6fe50a786b617a2aeae.tar.xz
gnupg2-c8f12e218f81f9211920b6fe50a786b617a2aeae.zip
changed structure of trustdb
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in20
1 files changed, 15 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index 7017948de..e83e10d5d 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,10 @@ dnl (Process this file with autoconf to produce a configure script.)
AC_INIT(g10/g10.c)
AC_CONFIG_AUX_DIR(scripts)
-AC_CONFIG_HEADER(config.h)
+dnl Ooops: automake 1.2d looks for AC_CONFIG_HEADER (and not AM_..)
+dnl to decide where config.h is - so we have to add it to
+dnl every makefile.am
+AM_CONFIG_HEADER(config.h)
if test "x$exec_prefix" = xNONE ; then
@@ -45,6 +48,14 @@ WK_CHECK_CACHE
dnl Checks for programs.
AC_PROG_MAKE_SET
+AC_ARG_PROGRAM
+
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+dnl AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
case "${target}" in
i386--mingw32)
@@ -64,16 +75,15 @@ AC_PROG_CPP
esac
-AC_ARG_PROGRAM
-
dnl Checks for libraries.
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(unistd.h)
-ud_GNU_GETTEXT
-WK_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl )
+dnl AM_GNU_GETTEXT
+dnl WK_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl )
+AC_MSG_WARN([i18n disabled for this release - sorry])
dnl Checks for typedefs, structures, and compiler characteristics.