[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
mdemo2 test fixes
From: |
Peter O'Gorman |
Subject: |
mdemo2 test fixes |
Date: |
Wed, 20 Aug 2003 01:18:00 +0900 |
Hi,
mdemo2-exec.test fails on darwin because, well, it is broken... here is
a patch inline and attached.
Peter
--
http://www.pogma.com
Index: ChangeLog
===================================================================
RCS file: /cvsroot/libtool/libtool/ChangeLog,v
retrieving revision 1.1252
diff -u -r1.1252 ChangeLog
--- ChangeLog 5 Aug 2003 16:05:00 -0000 1.1252
+++ ChangeLog 19 Aug 2003 15:48:41 -0000
@@ -1,3 +1,10 @@
+2003-08-19 Peter O'Gorman <address@hidden>
+
+ * mdemo2/configure.ac: Use AC_LIBTOOL_DLOPEN.
+ * mdemo2/main.c: Use LTDL_SET_PRELOADED_SYMBOLS().
+ * mdemo2/Makefile.am: Set INCLUDES properly and add -dlopen force
+ to make sure the symbols file is included in the link line.
+
2003-08-05 Jim Pick <address@hidden>,
Ito Kazumitsu <address@hidden>,
Gary V. Vaughan <address@hidden>
Index: mdemo2/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/mdemo2/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- mdemo2/Makefile.am 31 Jul 2003 20:44:29 -0000 1.1
+++ mdemo2/Makefile.am 19 Aug 2003 15:48:42 -0000
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = no-dependencies foreign
-INCLUDES = $(INCLTDL)
+INCLUDES = -I../libltdl
EXTRA_DIST = acinclude.m4
@@ -10,7 +10,7 @@
# Create a version of mdemo2 that links a library that does dlopen.
mdemo2_SOURCES = main.c
-mdemo2_LDFLAGS = -export-dynamic
+mdemo2_LDFLAGS = -export-dynamic "-dlopen" force
mdemo2_LDADD = ../mdemo/libmlib.la
# Create a statically linked version of mdemo.
Index: mdemo2/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/mdemo2/configure.ac,v
retrieving revision 1.1
diff -u -r1.1 configure.ac
--- mdemo2/configure.ac 31 Jul 2003 20:44:29 -0000 1.1
+++ mdemo2/configure.ac 19 Aug 2003 15:48:44 -0000
@@ -42,6 +42,7 @@
## ----------------------- ##
## Libtool initialisation. ##
## ----------------------- ##
+AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
Index: mdemo2/main.c
===================================================================
RCS file: /cvsroot/libtool/libtool/mdemo2/main.c,v
retrieving revision 1.1
diff -u -r1.1 main.c
--- mdemo2/main.c 31 Jul 2003 20:44:29 -0000 1.1
+++ mdemo2/main.c 19 Aug 2003 15:48:44 -0000
@@ -19,6 +19,7 @@
USA. */
#include <stdio.h>
+#include "ltdl.h"
int
main (argc, argv)
@@ -28,10 +29,12 @@
int ret = 0;
printf ("Welcome to GNU libtool mdemo2!\n");
-
if (argc < 2) {
fprintf (stderr, "usage: %s module [module...]\n", argv[0]);
}
+
+/* This must be called in the program to get the preloaded symbols */
+ LTDL_SET_PRELOADED_SYMBOLS();
ret = mlib_func(argc, argv);
mdemo2.diff.gz
Description: GNU Zip compressed data