From def51510004be6693013247f2fbda853d934a842 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Thu, 9 Dec 1999 23:35:14 +0000 Subject: [PATCH] From Stephan Kulow * libltdl/ltdl.m4: Add arg 3 to AC_DEFINE's to save the user from having to hack acconfig.h. --- ChangeLog | 6 ++++++ libltdl/ltdl.m4 | 18 +++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2959b0f5..2af4a167 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-12-10 Gary V. Vaughan + + From Stephan Kulow + * libltdl/ltdl.m4: Add arg 3 to AC_DEFINE's to save the user + from having to hack acconfig.h. + 1999-12-06 Gary V. Vaughan * NEWS: Updated. diff --git a/libltdl/ltdl.m4 b/libltdl/ltdl.m4 index 6587982f..23b0646a 100644 --- a/libltdl/ltdl.m4 +++ b/libltdl/ltdl.m4 @@ -120,11 +120,19 @@ fi AC_DEFUN(AC_LTDL_DLLIB, [LIBADD_DL= -AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"], -[AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL, 1)])]) -AC_CHECK_FUNC(shl_load, [AC_DEFINE(HAVE_SHL_LOAD, 1)], -[AC_CHECK_LIB(dld, shl_load, [AC_DEFINE(HAVE_SHL_LOAD, 1) LIBADD_DL="$LIBADD_DL -ldld"])]) -AC_CHECK_LIB(dld, dld_link, [AC_DEFINE(HAVE_DLD, 1)dnl +AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1, + [Define if you have the libdl library or equivalent. ]) LIBADD_DL="-ldl"], +[AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL, 1, + [Define if you have the libdl library or equivalent.])])]) +AC_CHECK_FUNC(shl_load, [AC_DEFINE(HAVE_SHL_LOAD, 1, + [Define if you have the shl_load function.])], +[AC_CHECK_LIB(dld, shl_load, + [AC_DEFINE(HAVE_SHL_LOAD, 1, + [Define if you have the shl_load function.]) + LIBADD_DL="$LIBADD_DL -ldld"]) +]) +AC_CHECK_LIB(dld, dld_link, [AC_DEFINE(HAVE_DLD, 1, + [Define if you have the GNU dld library.])dnl test "x$ac_cv_lib_dld_shl_load" = yes || LIBADD_DL="$LIBADD_DL -ldld"]) AC_SUBST(LIBADD_DL)