[patch] libmcs-dl.patch

libmcs-dl.patch (text/plain), 2.50 KB, created by Javier Villavicencio (RETIRED) on 2007-02-26 19:56:25 UTC

diff -Nur mcs-0.3.3.orig/configure.ac mcs-0.3.3/configure.ac
--- mcs-0.3.3.orig/configure.ac	2007-02-19 05:52:43.000000000 -0300
+++ mcs-0.3.3/configure.ac	2007-02-26 16:21:04.000000000 -0300
@@ -17,8 +17,7 @@
 AC_SUBST(PACKAGE)
 
 # Checks for libraries.
-# FIXME: Replace `main' with a function in `-ldl':
-AC_CHECK_LIB([dl], [dlopen], , [AC_ERROR([libdl is required for compilation])])
+AM_DL
 
 # Checks for header files.
 AC_HEADER_DIRENT
diff -Nur mcs-0.3.3.orig/m4/dl.m4 mcs-0.3.3/m4/dl.m4
--- mcs-0.3.3.orig/m4/dl.m4	1969-12-31 21:00:00.000000000 -0300
+++ mcs-0.3.3/m4/dl.m4	2007-02-26 16:20:43.000000000 -0300
@@ -0,0 +1,54 @@
+dnl
+dnl Check for dlopen symbol and set DYNAMIC_LD_LIBS.
+dnl
+dnl AM_DL()
+dnl
+
+AC_DEFUN([AM_DL], [
+  AC_CHECK_LIB(c, dlopen,
+   [DYNAMIC_LD_LIBS=""
+    have_dl=yes])
+
+  if test x$have_dl != "xyes"; then
+    AC_CHECK_LIB(dl, dlopen,
+     [DYNAMIC_LD_LIBS="-ldl"
+      have_dl=yes])
+  fi
+
+  if test x$have_dl != "xyes"; then
+    AC_MSG_CHECKING(for dlopen under win32)
+    AC_LANG_SAVE()
+    AC_LANG_C()
+
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    ac_save_LIBS="$LIBS"
+    CPPFLAGS="-I${srcdir}/win32/include $CPPFLAGS"
+    LIBS="$LIBS -lkernel32"
+    AC_COMPILE_IFELSE([
+#include <stddef.h>
+#include <dlfcn.h>
+
+int main() {
+  dlopen(NULL, 0);
+  return 0;
+}
+], 
+      [DYNAMIC_LD_LIBS=-lkernel32
+       have_dl=yes
+       AC_MSG_RESULT(yes)],
+       AC_MSG_RESULT(no)
+    )
+
+    CPPFLAGS=$ac_save_CPPFLAGS
+    LIBS=$ac_save_LIBS
+
+    AC_LANG_RESTORE()
+  fi
+
+  if test x$have_dl != "xyes"; then
+    AC_MSG_ERROR(dynamic linker needed)
+  fi
+
+  AC_SUBST(DYNAMIC_LD_LIBS)
+
+])
diff -Nur mcs-0.3.3.orig/mk/rules.mk.in mcs-0.3.3/mk/rules.mk.in
--- mcs-0.3.3.orig/mk/rules.mk.in	2007-02-19 05:52:43.000000000 -0300
+++ mcs-0.3.3/mk/rules.mk.in	2007-02-26 16:19:30.000000000 -0300
@@ -191,7 +191,7 @@
 INTL_LIBTOOL_SUFFIX_PREFIX ?= @INTL_LIBTOOL_SUFFIX_PREFIX@
 JACK_CFLAGS ?= @JACK_CFLAGS@
 JACK_LIBS ?= @JACK_LIBS@
-LDFLAGS ?= @LDFLAGS@
+LDFLAGS ?= @LDFLAGS@ @DYNAMIC_LD_LIBS@
 LIBBEEP_MAJOR_VERSION ?= @LIBBEEP_MAJOR_VERSION@
 LIBBEEP_MICRO_VERSION ?= @LIBBEEP_MICRO_VERSION@
 LIBBEEP_MINOR_VERSION ?= @LIBBEEP_MINOR_VERSION@
diff -Nur mcs-0.3.3.orig/src/libmcs/Makefile mcs-0.3.3/src/libmcs/Makefile
--- mcs-0.3.3.orig/src/libmcs/Makefile	2007-02-19 05:52:43.000000000 -0300
+++ mcs-0.3.3/src/libmcs/Makefile	2007-02-26 16:21:43.000000000 -0300
@@ -17,8 +17,6 @@
 	mcs_logger.c \
 	mcs_util.c
 
-LIBADD += -ldl
-
 OBJECTS = ${SOURCES:.c=.o}
 
 INCLUDEDIR = ${prefix}/include/libmcs