security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

* configure.ac: Add a --with-ldap=DIR so people can add to the search

Browse Source 
path.
This commit is contained in:
David Shaw 2004-12-17 23:07:59 +00:00
parent 74330a49ec
commit 39b0f6e4ea
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-17 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Add a --with-ldap=DIR so people can add to the
search path.
2004-12-16 David Shaw <dshaw@jabberwocky.com> 2004-12-16 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Check for arpa/nameser.h. * configure.ac: Check for arpa/nameser.h.

44
configure.ac
View File

@ -305,44 +305,47 @@ if test "$use_exec" = yes ; then
AC_MSG_RESULT($enableval) AC_MSG_RESULT($enableval)
if test "$gnupg_cv_enable_keyserver_helpers" = yes ; then if test "$gnupg_cv_enable_keyserver_helpers" = yes ; then
dnl LDAP is defined only after we confirm the library is available later
AC_MSG_CHECKING([whether LDAP keyserver support is requested]) AC_MSG_CHECKING([whether LDAP keyserver support is requested])
AC_ARG_ENABLE(ldap, AC_ARG_ENABLE(ldap,
[ --disable-ldap disable LDAP keyserver interface], AC_HELP_STRING([--disable-ldap],[disable LDAP keyserver interface only]),
try_ldap=$enableval, try_ldap=yes) try_ldap=$enableval, try_ldap=yes)
AC_MSG_RESULT($try_ldap) AC_MSG_RESULT($try_ldap)
AC_MSG_CHECKING([whether HKP keyserver support is requested]) AC_MSG_CHECKING([whether HKP keyserver support is requested])
AC_ARG_ENABLE(hkp, AC_ARG_ENABLE(hkp,
[ --disable-hkp disable HKP keyserver interface], AC_HELP_STRING([--disable-hkp],[disable HKP keyserver interface only]),
try_hkp=$enableval, try_hkp=yes) try_hkp=$enableval, try_hkp=yes)
AC_MSG_RESULT($try_hkp) AC_MSG_RESULT($try_hkp)
AC_MSG_CHECKING([whether HTTP key fetching support is requested]) AC_MSG_CHECKING([whether HTTP key fetching support is requested])
AC_ARG_ENABLE(http, AC_ARG_ENABLE(http,
AC_HELP_STRING([--disable-http],[disable HTTP key fetching interface]), AC_HELP_STRING([--disable-http],[disable HTTP key fetching interface]),
try_http=$enableval, try_http=yes) try_http=$enableval, try_http=yes)
AC_MSG_RESULT($try_http) AC_MSG_RESULT($try_http)
AC_MSG_CHECKING([whether Finger key fetching support is requested]) AC_MSG_CHECKING([whether finger key fetching support is requested])
AC_ARG_ENABLE(finger, AC_ARG_ENABLE(finger,
AC_HELP_STRING([--disable-finger], AC_HELP_STRING([--disable-finger],
[disable Finger key fetching interface]), [disable finger key fetching interface only]),
try_finger=$enableval, try_finger=yes) try_finger=$enableval, try_finger=yes)
AC_MSG_RESULT($try_finger) AC_MSG_RESULT($try_finger)
AC_MSG_CHECKING([whether email keyserver support is requested]) AC_MSG_CHECKING([whether email keyserver support is requested])
AC_ARG_ENABLE(mailto, AC_ARG_ENABLE(mailto,
[ --disable-mailto disable email keyserver interface], AC_HELP_STRING([--disable-mailto],
try_mailto=$enableval, try_mailto=yes) [disable email keyserver interface only]),
try_mailto=$enableval, try_mailto=yes)
AC_MSG_RESULT($try_mailto) AC_MSG_RESULT($try_mailto)
fi fi
AC_MSG_CHECKING([whether keyserver exec-path is enabled]) 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], AC_HELP_STRING([--disable-keyserver-path],
[if test "$enableval" = no ; then [disable the exec-path option for keyserver helpers]),
[if test "$enableval" = no ; then
AC_DEFINE(DISABLE_KEYSERVER_PATH,1,[define to disable exec-path for keyserver helpers]) AC_DEFINE(DISABLE_KEYSERVER_PATH,1,[define to disable exec-path for keyserver helpers])
fi],enableval=yes) fi],enableval=yes)
AC_MSG_RESULT($enableval) AC_MSG_RESULT($enableval)
fi fi
@ -591,6 +594,16 @@ AC_SUBST(SRVLIBS)
# LDAPLIBS="-Lfoo -lbar" # LDAPLIBS="-Lfoo -lbar"
if test "$try_ldap" = yes ; then if test "$try_ldap" = yes ; then
AC_ARG_WITH(ldap,
AC_HELP_STRING([--with-ldap=DIR],[look for the LDAP library in DIR]),
[
if test -d "$withval" ; then
CPPFLAGS="${CPPFLAGS} -I$withval/include"
LDFLAGS="${LDFLAGS} -L$withval/lib"
fi
])
for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv" "-lwldap32"; do for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv" "-lwldap32"; do
_ldap_save_libs=$LIBS _ldap_save_libs=$LIBS
LIBS="$MY_LDAPLIBS $NETLIBS $LIBS" LIBS="$MY_LDAPLIBS $NETLIBS $LIBS"
@ -1040,8 +1053,9 @@ AC_SUBST(MPI_SFLAGS)
AC_MSG_CHECKING([whether regular expression support is requested]) AC_MSG_CHECKING([whether regular expression support is requested])
AC_ARG_ENABLE(regex, AC_ARG_ENABLE(regex,
[ --disable-regex do not handle regular expressions in trust sigs], AC_HELP_STRING([--disable-regex],
use_regex=$enableval, use_regex=yes) [do not handle regular expressions in trust signatures]),
use_regex=$enableval, use_regex=yes)
AC_MSG_RESULT($use_regex) AC_MSG_RESULT($use_regex)
if test "$use_regex" = yes ; then if test "$use_regex" = yes ; then