mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-17 15:44:34 +02:00
* configure.ac: If the static IDEA cipher is present, disable dynamic
loading. Also fix backwards grammar of keyserver exec-path CHECKING message.
This commit is contained in:
parent
ce42e64a5a
commit
df50c106f8
@ -1,3 +1,9 @@
|
|||||||
|
2002-08-07 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* configure.ac: If the static IDEA cipher is present, disable
|
||||||
|
dynamic loading. Also fix backwards grammar of keyserver
|
||||||
|
exec-path CHECKING message.
|
||||||
|
|
||||||
2002-08-05 Werner Koch <wk@gnupg.org>
|
2002-08-05 Werner Koch <wk@gnupg.org>
|
||||||
|
|
||||||
* configure.ac: Bumbed version number.
|
* configure.ac: Bumbed version number.
|
||||||
|
49
configure.ac
49
configure.ac
@ -89,11 +89,32 @@ dnl
|
|||||||
dnl Check other options
|
dnl Check other options
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether use of extensions is requested])
|
# We don't need idea but some people claim that they need it for
|
||||||
AC_ARG_ENABLE(dynload,
|
# research etc., so we allow to place an idea source code into the
|
||||||
[ --disable-dynload disable use of extensions],
|
# cipher directory and statically link it if available, otherwise we
|
||||||
try_dynload=$enableval, try_dynload=yes)
|
# link to a stub. We don't use AC_CHECK_FILE to avoid caching.
|
||||||
AC_MSG_RESULT($try_dynload)
|
AC_MSG_CHECKING(for extra cipher modules)
|
||||||
|
tmp=""
|
||||||
|
if test -f $srcdir/cipher/idea.c; then
|
||||||
|
IDEA_O=idea.o
|
||||||
|
tmp=idea
|
||||||
|
else
|
||||||
|
IDEA_O=idea-stub.o
|
||||||
|
tmp=no
|
||||||
|
fi
|
||||||
|
AC_SUBST(IDEA_O)
|
||||||
|
AC_MSG_RESULT($tmp)
|
||||||
|
|
||||||
|
# if the static idea is present, disable dynload.
|
||||||
|
if test "$IDEA_O" = idea-stub.o ; then
|
||||||
|
AC_MSG_CHECKING([whether use of extensions is requested])
|
||||||
|
AC_ARG_ENABLE(dynload,
|
||||||
|
[ --disable-dynload disable use of extensions],
|
||||||
|
try_dynload=$enableval, try_dynload=yes)
|
||||||
|
AC_MSG_RESULT($try_dynload)
|
||||||
|
else
|
||||||
|
try_dynload=no
|
||||||
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether assembler modules are requested])
|
AC_MSG_CHECKING([whether assembler modules are requested])
|
||||||
AC_ARG_ENABLE(asm,
|
AC_ARG_ENABLE(asm,
|
||||||
@ -177,7 +198,7 @@ if test "$use_exec" = yes ; then
|
|||||||
AC_MSG_RESULT($try_mailto)
|
AC_MSG_RESULT($try_mailto)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to disable keyserver exec-path])
|
AC_MSG_CHECKING([whether keyserver exec-path is enabled])
|
||||||
AC_ARG_ENABLE(keyserver-path,
|
AC_ARG_ENABLE(keyserver-path,
|
||||||
[ --disable-keyserver-path disable the exec-path option for keyserver helpers],
|
[ --disable-keyserver-path disable the exec-path option for keyserver helpers],
|
||||||
[if test "$enableval" = no ; then
|
[if test "$enableval" = no ; then
|
||||||
@ -666,22 +687,6 @@ case "$static_random_module" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# We don't need idea but some people claim that they need it for
|
|
||||||
# research etc., so we allow to place an idea source code into the
|
|
||||||
# cipher directory and statically link it if available, otherwise we
|
|
||||||
# link to a stub. We don't use AC_CHECK_FILE to avoid caching.
|
|
||||||
AC_MSG_CHECKING(for extra cipher modules)
|
|
||||||
tmp=""
|
|
||||||
if test -f $srcdir/cipher/idea.c; then
|
|
||||||
IDEA_O=idea.o
|
|
||||||
tmp=idea
|
|
||||||
else
|
|
||||||
IDEA_O=idea-stub.o
|
|
||||||
fi
|
|
||||||
AC_SUBST(IDEA_O)
|
|
||||||
AC_MSG_RESULT($tmp)
|
|
||||||
|
|
||||||
|
|
||||||
dnl setup assembler stuff
|
dnl setup assembler stuff
|
||||||
AC_MSG_CHECKING(for mpi assembler functions)
|
AC_MSG_CHECKING(for mpi assembler functions)
|
||||||
if test -f $srcdir/mpi/config.links ; then
|
if test -f $srcdir/mpi/config.links ; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user