security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

* configure.ac (DLLIBS): Work properly on platforms where dlopen and 

friends are in libc instead of libdl.
This commit is contained in:
David Shaw 2003-10-25 02:56:33 +00:00
parent 624612b991
commit 8fbf5b8aba
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-24 David Shaw <dshaw@jabberwocky.com>
* configure.ac (DLLIBS): Work properly on platforms where dlopen
and friends are in libc instead of libdl.
2003-10-24 Werner Koch <wk@gnupg.org> 2003-10-24 Werner Koch <wk@gnupg.org>
* configure.ac (DLLIBS): Fixed last change. * configure.ac (DLLIBS): Fixed last change.

30
configure.ac
View File

@ -344,7 +344,7 @@ MPI_OPT_FLAGS=""
try_gettext=yes try_gettext=yes
have_dosish_system=no have_dosish_system=no
no_need_for_dlopen=no need_dlopen=yes
case "${target}" in case "${target}" in
*-*-mingw32*) *-*-mingw32*)
# special stuff for Windoze NT # special stuff for Windoze NT
@ -358,7 +358,7 @@ case "${target}" in
MingW32 systems and these systems lack Posix functions, MingW32 systems and these systems lack Posix functions,
we use a simplified version of gettext]) we use a simplified version of gettext])
have_dosish_system=yes have_dosish_system=yes
no_need_for_dlopen=yes need_dlopen=no
try_gettext="no" try_gettext="no"
;; ;;
i?86-emx-os2 | i?86-*-os2*emx ) i?86-emx-os2 | i?86-*-os2*emx )
@ -632,21 +632,18 @@ else
fi fi
if test "$try_extensions" = yes || test x"$card_support" = xyes ; then if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
if test "$no_need_for_dlopen" = yes; then if test "$need_dlopen" = yes; then
AC_SUBST(DLLIBS,"") _dl_save_libs=$LIBS
else LIBS=""
AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl,dlopen,found_dlopen=yes)) AC_SEARCH_LIBS(dlopen,dl,found_dlopen=yes)
if test x"$found_dlopen" = "xyes" ; then if test x"$found_dlopen" = "xyes" ; then
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") DLLIBS=$LIBS
if test "$try_extensions" = yes ; then
AC_DEFINE(USE_DYNAMIC_LINKING,1,
[define to enable the use of extensions])
fi
else else
if test "$try_extensions" = yes ; then if test "$try_extensions" = yes ; then
AC_MSG_WARN([dlopen not found. Disabling extensions.]) AC_MSG_WARN([dlopen not found. Disabling extensions.])
try_extensions=no
fi fi
if test "$card_support" = yes ; then if test "$card_support" = yes ; then
@ -654,11 +651,18 @@ if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
card_support=no card_support=no
fi fi
fi fi
LIBS=$_dl_save_libs
fi fi
fi fi
AC_SUBST(DLLIBS)
if test "$card_support" = yes ; then if test "$card_support" = yes ; then
AC_DEFINE(ENABLE_CARD_SUPPORT,1, AC_DEFINE(ENABLE_CARD_SUPPORT,1,[Define to include OpenPGP card support])
[Define to include the OpenPGP card support]) fi
if test "$try_extensions" = yes ; then
AC_DEFINE(USE_DYNAMIC_LINKING,1,[Define to enable the use of extensions])
fi fi
AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes) AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)