diff options
| author | Werner Koch <wk@gnupg.org> | 1999-07-07 13:28:26 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1999-07-07 13:28:26 +0200 |
| commit | bd7298cf0dbeacbd415acdf814acace9aabb8455 (patch) | |
| tree | ae235766ee42b77ba5ca19dfb1bf99e678154e3d /configure.in | |
| parent | See ChangeLog: Fri Jul 2 11:45:54 CEST 1999 Werner Koch (diff) | |
| download | gnupg2-bd7298cf0dbeacbd415acdf814acace9aabb8455.tar.xz gnupg2-bd7298cf0dbeacbd415acdf814acace9aabb8455.zip | |
See ChangeLog: Wed Jul 7 13:23:40 CEST 1999 Werner Koch
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/configure.in b/configure.in index e5d79389d..d94a76a6b 100644 --- a/configure.in +++ b/configure.in @@ -109,8 +109,18 @@ AC_MSG_CHECKING([whether compilation of libgcrypt is requested]) AC_ARG_ENABLE(libgcrypt, [ --enable-libgcrypt compile the libgcrypt [default=no]], [compile_libgcrypt="$enableval"],[compile_libgcrypt=no]) -AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes) AC_MSG_RESULT($compile_libgcrypt) +if test x$compile_libgcrypt = xyes ; then + if test -f $srcdir/gcrypt/gcrypt.h; then + : + else + compile_libgcrypt=no + AC_MSG_WARN([[ +*** LIBGCRYPT is not yet ready for public testing. +*** Maybe you have more luck with the next release of GnuPG]]) + fi +fi +AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes) dnl @@ -123,6 +133,8 @@ AC_ARG_WITH(capabilities, AC_MSG_RESULT($use_capabilities) +AM_MAINTAINER_MODE + dnl Checks for programs. AC_CANONICAL_SYSTEM @@ -139,15 +151,17 @@ AC_PROG_CC AC_PROG_CPP AC_ISC_POSIX AC_PROG_INSTALL -AC_PROG_RANLIB +AC_PROG_AWK AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no) AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes) dnl -dnl Don't default to build shared libs +dnl Build shared libraries only when compilation of libgcrypt +dnl has been requested dnl AM_DISABLE_SHARED +enable_shared="$compile_libgcrypt" AM_PROG_LIBTOOL @@ -486,7 +500,7 @@ for name in $MODULES_IN_CIPHER; do done; if test $x = yes; then STATIC_CIPHER_NAMES="$STATIC_CIPHER_NAMES $name" - STATIC_CIPHER_OBJS="$STATIC_CIPHER_OBJS $name.o" + STATIC_CIPHER_OBJS="$STATIC_CIPHER_OBJS $name.lo" else DYNAMIC_CIPHER_MODS="$DYNAMIC_CIPHER_MODS $name" GNUPG_MSG_PRINT([$name]) @@ -556,7 +570,7 @@ if test "$ac_cv_mpi_extra_asm_modules" != ""; then GNUPG_MSG_PRINT([mpi extra asm functions:]) for i in $ac_cv_mpi_extra_asm_modules; do GNUPG_MSG_PRINT([$i]) - MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o" + MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.lo" done AC_MSG_RESULT() fi |