security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-10-31 20:08:43 +01:00
Code Activity

* configure.ac: Include -ldl when card support is used.

Browse Source
This commit is contained in:
David Shaw 2003-10-16 23:44:03 +00:00
parent 6ad91b2b3a
commit b194ed0e0a
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2003-10-16 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Include -ldl when card support is used.
2003-10-10 Werner Koch <wk@gnupg.org> 2003-10-10 Werner Koch <wk@gnupg.org>
Release 1.3.3. Release 1.3.3.

39
configure.ac
View File

@ -108,16 +108,11 @@ AC_ARG_ENABLE(card-support,
[ --enable-card-support enable OpenPGP card support], [ --enable-card-support enable OpenPGP card support],
card_support=$enableval, card_support=no) card_support=$enableval, card_support=no)
AC_MSG_RESULT($card_support) AC_MSG_RESULT($card_support)
if test "$card_support" = yes ; then
AC_DEFINE(ENABLE_CARD_SUPPORT,1,
[Define to include the OpenPGP card support])
fi
AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)
dnl See if we are disabling any algorithms or features for a smaller dnl See if we are disabling any algorithms or features for a smaller
dnl binary dnl binary
try_dynload=no try_extensions=no
use_idea=yes use_idea=yes
use_cast5=yes use_cast5=yes
@ -160,7 +155,7 @@ if test x"$use_idea" = xyes ; then
else else
IDEA_O=idea-stub.o IDEA_O=idea-stub.o
tmp=no tmp=no
try_dynload=yes try_extensions=yes
fi fi
AC_SUBST(IDEA_O) AC_SUBST(IDEA_O)
AC_MSG_RESULT($tmp) AC_MSG_RESULT($tmp)
@ -584,7 +579,7 @@ case "${target}" in
;; ;;
i?86-*-msdosdjgpp*) i?86-*-msdosdjgpp*)
PRINTABLE_OS_NAME="MSDOS/DJGPP" PRINTABLE_OS_NAME="MSDOS/DJGPP"
try_dynload=no try_extensions=no
;; ;;
*-linux*) *-linux*)
PRINTABLE_OS_NAME="GNU/Linux" PRINTABLE_OS_NAME="GNU/Linux"
@ -638,19 +633,35 @@ else
AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(BUILD_INCLUDED_LIBINTL)
fi fi
if test "$try_dynload" = yes ; then if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl,dlopen,found_dlopen=yes)) AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl,dlopen,found_dlopen=yes))
if test x"$found_dlopen" = "xyes" ; then if test x"$found_dlopen" = "xyes" ; then
AC_DEFINE(USE_DYNAMIC_LINKING,1,[define to enable the use of extensions])
AC_DEFINE(HAVE_DL_DLOPEN,1, AC_DEFINE(HAVE_DL_DLOPEN,1,
[Defined when the dlopen function family is available]) [Defined when the dlopen function family is available])
AC_SUBST(DLLIBS,"-ldl") AC_SUBST(DLLIBS,"-ldl")
fi
else if test "$try_extensions" = yes ; then
AC_MSG_CHECKING(for dynamic loading) AC_DEFINE(USE_DYNAMIC_LINKING,1,
AC_MSG_RESULT(has been disabled) [define to enable the use of extensions])
fi fi
if test "$card_support" = yes ; then
AC_DEFINE(ENABLE_CARD_SUPPORT,1,
[Define to include the OpenPGP card support])
fi
else
if test "$try_extensions" = yes ; then
AC_MSG_WARN([dlopen not found. Disabling extensions.])
fi
if test "$card_support" = yes ; then
AC_MSG_WARN([dlopen not found. Disabling OpenPGP card support.])
card_support=no
fi
fi
fi
AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC