* aclocal.m4 (WITH_CC): Don't use -pedantic on Linux.

(KRB5_AC_FIND_DLOPEN): New macro.  Set DL_LIB.
(CONFIG_RULES, AC_KRB5_TCL_TRYOLD): Use it.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17262 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 38cc092ab2f1802ea78a1ee429daaa88beb6dbe9..ca201e63d968455ccb4fc215abbdbb56a932de9e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,12 @@
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
+       * aclocal.m4 (WITH_CC): Don't use -pedantic on Linux.
+       (KRB5_AC_FIND_DLOPEN): New macro.  Set DL_LIB.
+       (CONFIG_RULES, AC_KRB5_TCL_TRYOLD): Use it.
+
        Novell merge.
        * aclocal.m4:
 
-       * aclocal.m4 (WITH_CC): Don't use -pedantic on Linux.
-
 2005-06-14  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Check for endian.h.

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 2ff8567f192dd126cddcd6a6715957d2e01a129d..53423564a31c694bfd8c9c58b12870845eedb7d3 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -79,6 +79,7 @@ KRB5_AC_PRAGMA_WEAK_REF
 KRB5_LIB_PARAMS
 KRB5_AC_INITFINI
 KRB5_AC_ENABLE_THREADS
+KRB5_AC_FIND_DLOPEN
 ])dnl
 
 dnl Maintainer mode, akin to what automake provides, 'cept we don't
@@ -129,6 +130,14 @@ if test "$use_linker_fini_option" = yes; then
 fi
 ])
 
+dnl find dlopen
+AC_DEFUN([KRB5_AC_FIND_DLOPEN],[
+AC_CHECK_LIB(dl, dlopen, DL_LIB=-ldl)
+AC_CHECK_LIB(ld, main, DL_LIB=-lld)
+AC_SUBST(DL_LIB)
+])
+
+
 dnl Hack for now.
 AC_DEFUN([KRB5_AC_ENABLE_THREADS],[
 AC_ARG_ENABLE([thread-support],
@@ -980,6 +989,7 @@ dnl AC_KRB5_TCL_TRYOLD
 dnl attempt to use old search algorithm for locating tcl
 dnl
 AC_DEFUN(AC_KRB5_TCL_TRYOLD, [
+AC_REQUIRE([KRB5_AC_FIND_DLOPEN])
 AC_MSG_WARN([trying old tcl search code])
 if test "$with_tcl" != yes -a "$with_tcl" != no; then
        TCL_INCLUDES=-I$with_tcl/include
@@ -987,8 +997,6 @@ if test "$with_tcl" != yes -a "$with_tcl" != no; then
        TCL_RPATH=:$with_tcl/lib
 fi
 if test "$with_tcl" != no ; then
-       AC_CHECK_LIB(dl, dlopen, DL_LIB=-ldl)
-       AC_CHECK_LIB(ld, main, DL_LIB=-lld)
        krb5_save_CPPFLAGS="$CPPFLAGS"
        krb5_save_LDFLAGS="$LDFLAGS"
        CPPFLAGS="$CPPFLAGS $TCL_INCLUDES"