security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-22 15:11:41 +02:00
Code Activity

(DLLIBS): Fixed last change.

Browse Source
This commit is contained in:
Werner Koch 2003-10-24 16:57:02 +00:00
parent 00ec05898e
commit 068358616f
2 changed files with 30 additions and 28 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-24 Werner Koch <wk@gnupg.org>
* configure.ac (DLLIBS): Fixed last change.
2003-10-23 Werner Koch <wk@gnupg.org> 2003-10-23 Werner Koch <wk@gnupg.org>
* configure.ac (DLLIBS): Do not include -ldl in the mingw32 case. * configure.ac (DLLIBS): Do not include -ldl in the mingw32 case.

54
configure.ac
View File

@ -344,6 +344,7 @@ MPI_OPT_FLAGS=""
try_gettext=yes try_gettext=yes
have_dosish_system=no have_dosish_system=no
no_need_for_dlopen=no
case "${target}" in case "${target}" in
*-*-mingw32*) *-*-mingw32*)
# special stuff for Windoze NT # special stuff for Windoze NT
@ -357,6 +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
try_gettext="no" try_gettext="no"
;; ;;
i?86-emx-os2 | i?86-*-os2*emx ) i?86-emx-os2 | i?86-*-os2*emx )
@ -630,38 +632,34 @@ 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
AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl,dlopen,found_dlopen=yes)) if test "$no_need_for_dlopen" = yes; then
if test x"$found_dlopen" = "xyes" ; then AC_SUBST(DLLIBS,"")
AC_DEFINE(HAVE_DL_DLOPEN,1,
[Defined when the dlopen function family is available])
case "${target}" in
*-*-mingw32*)
;;
*)
AC_SUBST(DLLIBS,"-ldl")
;;
esac
if test "$try_extensions" = yes ; then
AC_DEFINE(USE_DYNAMIC_LINKING,1,
[define to enable the use of extensions])
fi
if test "$card_support" = yes ; then
AC_DEFINE(ENABLE_CARD_SUPPORT,1,
[Define to include the OpenPGP card support])
fi
else else
if test "$try_extensions" = yes ; then AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl,dlopen,found_dlopen=yes))
AC_MSG_WARN([dlopen not found. Disabling extensions.]) if test x"$found_dlopen" = "xyes" ; then
fi AC_DEFINE(HAVE_DL_DLOPEN,1,
[Defined when the dlopen function family is available])
if test "$card_support" = yes ; then AC_SUBST(DLLIBS,"-ldl")
AC_MSG_WARN([dlopen not found. Disabling OpenPGP card support.]) if test "$try_extensions" = yes ; then
card_support=no AC_DEFINE(USE_DYNAMIC_LINKING,1,
[define to enable the use of extensions])
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
fi fi
fi fi
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) AM_CONDITIONAL(ENABLE_CARD_SUPPORT, test "$card_support" = yes)