1 --- libltdl/ltdl.m4.orig 2004-01-04 15:47:53.996831016 +0100
2 +++ libltdl/ltdl.m4 2004-01-04 15:49:02.439426160 +0100
8 +AC_DEFUN([AC_LIB_LTDL],
10 AC_REQUIRE([AC_PROG_CC])dnl
11 AC_REQUIRE([AC_C_CONST])dnl
13 AC_REQUIRE([AC_LIB_LTDL_COMMON])dnl
16 -AC_DEFUN(KDE_LIB_LTDL,
17 +AC_DEFUN([KDE_LIB_LTDL],
19 AC_REQUIRE([AC_PROG_CC])dnl
20 AC_REQUIRE([AC_LIB_LTDL_COMMON])dnl
23 -AC_DEFUN(AC_LIB_LTDL_COMMON,
24 +AC_DEFUN([AC_LIB_LTDL_COMMON],
26 dnl AC_LIB_LTDL must perform all the checks necessary for compilation
27 dnl of the ltdl objects -- including compiler checks (above) and header
29 AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS])dnl
32 -AC_DEFUN(AC_LTDL_ENABLE_INSTALL,
33 +AC_DEFUN([AC_LTDL_ENABLE_INSTALL],
34 [AC_ARG_ENABLE(ltdl-install,
35 [ --enable-ltdl-install install libltdl])
41 -AC_DEFUN(AC_LTDL_SNARF_CONFIG,
42 +AC_DEFUN([AC_LTDL_SNARF_CONFIG],
43 [# Read the libtool configuration
45 ./libtool --config > conftest
48 # AC_LTDL_SYS_DLOPEN_DEPLIBS
49 # --------------------------
50 -AC_DEFUN(AC_LTDL_SYS_DLOPEN_DEPLIBS,
51 +AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS],
52 [AC_REQUIRE([AC_CANONICAL_HOST])
53 AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
54 libltdl_cv_sys_dlopen_deplibs, [dnl
57 ])# AC_LTDL_SYS_DLOPEN_DEPLIBS
59 -AC_DEFUN(AC_LTDL_SHLIBEXT,
60 +AC_DEFUN([AC_LTDL_SHLIBEXT],
61 [AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl
62 AC_CACHE_CHECK([which extension is used for shared libraries],
63 libltdl_cv_shlibext, [dnl
68 -AC_DEFUN(AC_LTDL_SHLIBPATH,
69 +AC_DEFUN([AC_LTDL_SHLIBPATH],
70 [AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl
71 AC_CACHE_CHECK([which variable specifies run-time library path],
72 libltdl_cv_shlibpath_var, [libltdl_cv_shlibpath_var="$shlibpath_var"])
77 -AC_DEFUN(AC_LTDL_SYSSEARCHPATH,
78 +AC_DEFUN([AC_LTDL_SYSSEARCHPATH],
79 [AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl
80 AC_CACHE_CHECK([for the default library search path],
81 libltdl_cv_sys_search_path, [libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"])
86 -AC_DEFUN(AC_LTDL_OBJDIR,
87 +AC_DEFUN([AC_LTDL_OBJDIR],
88 [AC_CACHE_CHECK([for objdir],
89 libltdl_cv_objdir, [libltdl_cv_objdir="$objdir"
90 if test -n "$objdir"; then
92 [Define to the sub-directory in which libtool stores uninstalled libraries. ])
95 -AC_DEFUN(AC_LTDL_DLPREOPEN,
96 +AC_DEFUN([AC_LTDL_DLPREOPEN],
97 [AC_REQUIRE([AC_LTDL_GLOBAL_SYMBOL_PIPE])dnl
98 AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
99 libltdl_cv_preloaded_symbols, [dnl
104 -AC_DEFUN(AC_LTDL_DLLIB,
105 +AC_DEFUN([AC_LTDL_DLLIB],
107 AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1,
108 [Define if you have the libdl library or equivalent. ]) LIBADD_DL="-ldl"],
113 -AC_DEFUN(AC_LTDL_GLOBAL_SYMBOL_PIPE,
114 +AC_DEFUN([AC_LTDL_GLOBAL_SYMBOL_PIPE],
115 [dnl Check for command to grab the raw symbol name followed
116 dnl by C symbol name from nm.
117 AC_REQUIRE([AC_CANONICAL_HOST])dnl
119 AC_MSG_RESULT($ac_result)
122 -AC_DEFUN(AC_LTDL_SYMBOL_USCORE,
123 +AC_DEFUN([AC_LTDL_SYMBOL_USCORE],
124 [dnl does the compiler prefix global symbols with an underscore?
125 AC_REQUIRE([AC_LTDL_GLOBAL_SYMBOL_PIPE])dnl
126 AC_MSG_CHECKING([for _ prefix in compiled symbols])
128 AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
131 -AC_DEFUN(AC_LTDL_DLSYM_USCORE,
132 +AC_DEFUN([AC_LTDL_DLSYM_USCORE],
133 [AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])dnl
134 if test x"$ac_cv_sys_symbol_underscore" = xyes; then
135 if test x"$ac_cv_func_dlopen" = xyes ||