projects
/
freeradius.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in error message
[freeradius.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
c7d41e6
..
6cf97e4
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-72,14
+72,17
@@
if test -z "$makever"; then
from ftp://prep.ai.mit.edu/pub/gnu/make/ before continuing.)
fi
from ftp://prep.ai.mit.edu/pub/gnu/make/ before continuing.)
fi
-AC_ARG_WITH(system-lib
tl
dl,
-[ --with-system-lib
tldl Use the libt
ltdl installed in your system (default=use our own)],
+AC_ARG_WITH(system-lib
lt
dl,
+[ --with-system-lib
ltdl Use the lib
ltdl installed in your system (default=use our own)],
[
LIBLTDL="-lltdl"
INCLTDL=
LTDL_SUBDIRS=
[
LIBLTDL="-lltdl"
INCLTDL=
LTDL_SUBDIRS=
+enable_ltdl_install=no
],
[
],
[
+dnl If libltdl isn't installable, set it to be installable.
+[test x"$enable_ltdl_install" = x && enable_ltdl_install=yes]
AC_LIBLTDL_INSTALLABLE
dnl tell Makefile to build ltdl if needed
AC_LIBLTDL_INSTALLABLE
dnl tell Makefile to build ltdl if needed
@@
-520,8
+523,9
@@
dnl Check for OpenSSL libraries.
OPENSSL_LIBS=
if test "x$WITH_OPENSSL" = xyes; then
old_LIBS=$LIBS
OPENSSL_LIBS=
if test "x$WITH_OPENSSL" = xyes; then
old_LIBS=$LIBS
+ old_LDFLAGS="$LDFLAGS"
if test "x$OPENSSL_LIB_DIR" != "x"; then
if test "x$OPENSSL_LIB_DIR" != "x"; then
- L
IBS="-L$OPENSSL_LIB_DIR $LIBS
"
+ L
DFLAGS="$LDFLAGS -L$OPENSSL_LIB_DIR
"
fi
AC_CHECK_LIB(crypto, DH_new,
[
fi
AC_CHECK_LIB(crypto, DH_new,
[
@@
-539,6
+543,7
@@
if test "x$WITH_OPENSSL" = xyes; then
], [])
], [])
LIBS=$old_LIBS
], [])
], [])
LIBS=$old_LIBS
+ LDFLAGS="$old_LDFLAGS"
fi
AC_CHECK_LIB(ws2_32, htonl)
fi
AC_CHECK_LIB(ws2_32, htonl)
@@
-930,6
+935,11
@@
dnl # 7. Checks for library functions
dnl #
dnl #############################################################
dnl #
dnl #############################################################
+old_LIBS="$LIBS"
+LIBS="$LIBS $LIBLTDL"
+AC_CHECK_FUNC(lt_dladvise_init, AC_DEFINE(HAVE_HAVE_LT_DLADVISE_INIT, [], [Do we have the lt_dladvise_init function]))
+LIBS="$old_LIBS"
+
dnl Check for libcrypt
dnl We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
AC_CHECK_LIB(crypt, crypt,
dnl Check for libcrypt
dnl We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
AC_CHECK_LIB(crypt, crypt,