diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2004-11-29 11:27:12 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2004-11-29 11:27:12 +0000 |
| commit | 5252d956959837700520dc12c533ff5d0cce1bdd (patch) | |
| tree | 924eb5ba2eb583bc100c5b252dabb3912e5678e6 | |
| parent | 21972621191dc5187436e09e74b3291250a8d36c (diff) | |
| download | external_llvm-5252d956959837700520dc12c533ff5d0cce1bdd.zip external_llvm-5252d956959837700520dc12c533ff5d0cce1bdd.tar.gz external_llvm-5252d956959837700520dc12c533ff5d0cce1bdd.tar.bz2 | |
Converted with autoupdate for autoconf 2.50 -> 2.59 differences.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18343 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/m4/ltdl.m4 | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/autoconf/m4/ltdl.m4 b/autoconf/m4/ltdl.m4 index 1941b87..9367a29 100644 --- a/autoconf/m4/ltdl.m4 +++ b/autoconf/m4/ltdl.m4 @@ -75,7 +75,7 @@ AC_CONFIG_SUBDIRS([libltdl]) # Perform all the checks necessary for compilation of the ltdl objects # -- including compiler checks and header checks. AC_DEFUN([AC_LIB_LTDL], -[AC_PREREQ(2.50) +[AC_PREREQ(2.59) AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_C_CONST]) AC_REQUIRE([AC_HEADER_STDC]) @@ -110,7 +110,7 @@ AC_CHECK_FUNCS([closedir opendir readdir]) # ---------------------- AC_DEFUN([AC_LTDL_ENABLE_INSTALL], [AC_ARG_ENABLE([ltdl-install], - [AC_HELP_STRING([--enable-ltdl-install], [install libltdl])]) + [AS_HELP_STRING([--enable-ltdl-install], [install libltdl])]) AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno) AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno) @@ -313,14 +313,11 @@ AC_CHECK_FUNC([shl_load], [AC_DEFINE([HAVE_LIBDL], [1], [Define if you have the libdl library or equivalent.]) LIBADD_DL="-ldl" libltdl_cv_lib_dl_dlopen="yes"], - [AC_TRY_LINK([#if HAVE_DLFCN_H + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H # include <dlfcn.h> #endif - ], - [dlopen(0, 0);], - [AC_DEFINE([HAVE_LIBDL], [1], - [Define if you have the libdl library or equivalent.]) libltdl_cv_func_dlopen="yes"], - [AC_CHECK_LIB([svld], [dlopen], + ]], [[dlopen(0, 0);]])],[AC_DEFINE([HAVE_LIBDL], [1], + [Define if you have the libdl library or equivalent.]) libltdl_cv_func_dlopen="yes"],[AC_CHECK_LIB([svld], [dlopen], [AC_DEFINE([HAVE_LIBDL], [1], [Define if you have the libdl library or equivalent.]) LIBADD_DL="-lsvld" libltdl_cv_func_dlopen="yes"], @@ -372,15 +369,15 @@ EOF if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then : else - echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC + echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD() fi fi else - echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC + echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD() fi else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC + echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD() + cat conftest.c >&AS_MESSAGE_LOG_FD() fi rm -rf conftest* ]) |