r15263 - gnucash/branches/reshuffle-modules - Remove remaining ltdl stuff, i.e. -lltdl, LTDL_LIBRARY_PATH, the
Andreas Köhler
andi5 at cvs.gnucash.org
Wed Dec 27 11:54:50 EST 2006
Author: andi5
Date: 2006-12-27 11:54:48 -0500 (Wed, 27 Dec 2006)
New Revision: 15263
Trac: http://svn.gnucash.org/trac/changeset/15263
Modified:
gnucash/branches/reshuffle-modules/
gnucash/branches/reshuffle-modules/configure.in
gnucash/branches/reshuffle-modules/doc/README.dependencies
gnucash/branches/reshuffle-modules/packaging/gnucash.spec.in
gnucash/branches/reshuffle-modules/src/backend/postgres/test/Makefile.am
gnucash/branches/reshuffle-modules/src/bin/gnucash-valgrind.in
gnucash/branches/reshuffle-modules/src/bin/gnucash.in
gnucash/branches/reshuffle-modules/src/bin/overrides/gnucash-env.in
gnucash/branches/reshuffle-modules/src/business/business-core/test/Makefile.am
gnucash/branches/reshuffle-modules/src/engine/test-core/Makefile.am
gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am
gnucash/branches/reshuffle-modules/src/gnc-module/Makefile.am
gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am
gnucash/branches/reshuffle-modules/src/gnc-module/test/test-dynload.c
gnucash/branches/reshuffle-modules/src/import-export/qif-io-core/test/Makefile.am
gnucash/branches/reshuffle-modules/src/valgrind-gnucash.supp
Log:
Remove remaining ltdl stuff, i.e. -lltdl, LTDL_LIBRARY_PATH, the
configure check. Make test-dynload.c use GModule too.
Property changes on: gnucash/branches/reshuffle-modules
___________________________________________________________________
Name: svk:merge
- 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1007
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
+ 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/reshuffle-modules:1041
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:990
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13714
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
Modified: gnucash/branches/reshuffle-modules/configure.in
===================================================================
--- gnucash/branches/reshuffle-modules/configure.in 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/configure.in 2006-12-27 16:54:48 UTC (rev 15263)
@@ -146,11 +146,6 @@
fi
fi
-AC_CHECK_HEADERS(ltdl.h)
-if test "x$ac_cv_header_ltdl_h" = xno; then
- AC_MSG_ERROR([Cannot find ltdl.h -- libtool-devel (or libtool-ltdl-devel) not installed?])
-fi
-
# test whether we are building directly from SVN/SVK
${srcdir}/util/gnc-svnversion ${srcdir} >/dev/null 2>&1
if test $? = 0 ; then
Modified: gnucash/branches/reshuffle-modules/doc/README.dependencies
===================================================================
--- gnucash/branches/reshuffle-modules/doc/README.dependencies 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/doc/README.dependencies 2006-12-27 16:54:48 UTC (rev 15263)
@@ -15,7 +15,6 @@
libgnomeui-devel
libgsf-devel
libjpeg-devel
- libtool-ltdl-devel
openssl-devel
If you are compiling with the --enable-ofx or --enable-hbci flags,
Modified: gnucash/branches/reshuffle-modules/packaging/gnucash.spec.in
===================================================================
--- gnucash/branches/reshuffle-modules/packaging/gnucash.spec.in 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/packaging/gnucash.spec.in 2006-12-27 16:54:48 UTC (rev 15263)
@@ -50,7 +50,6 @@
BuildRequires: bzip2-devel, expat-devel, guile-devel
BuildRequires: libglade2-devel, libgsf-devel
BuildRequires: libjpeg-devel, openssl-devel
-BuildRequires: libtool-ltdl-devel
%description
GnuCash is a personal finance manager. A check-book like
Modified: gnucash/branches/reshuffle-modules/src/backend/postgres/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/backend/postgres/test/Makefile.am 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/backend/postgres/test/Makefile.am 2006-12-27 16:54:48 UTC (rev 15263)
@@ -25,8 +25,7 @@
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
- -lltdl \
- -lpq
+ -lpq
test_db_SOURCES = \
${top_srcdir}/src/backend/postgres/PostgresBackend.c \
Modified: gnucash/branches/reshuffle-modules/src/bin/gnucash-valgrind.in
===================================================================
--- gnucash/branches/reshuffle-modules/src/bin/gnucash-valgrind.in 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/bin/gnucash-valgrind.in 2006-12-27 16:54:48 UTC (rev 15263)
@@ -17,13 +17,11 @@
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_MODULE_DIR-@"
LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
-LTDL_LIBRARY_PATH="${EXTRA_LIBS}:${LTDL_LIBRARY_PATH}"
TOP_SRC_DIR="@-TOP_SRC_DIR-@"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
-export LTDL_LIBRARY_PATH
#
# Other potentially useful options, particularly for valgrind-2.x:
Modified: gnucash/branches/reshuffle-modules/src/bin/gnucash.in
===================================================================
--- gnucash/branches/reshuffle-modules/src/bin/gnucash.in 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/bin/gnucash.in 2006-12-27 16:54:48 UTC (rev 15263)
@@ -17,11 +17,9 @@
EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_MODULE_DIR-@"
LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
-LTDL_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LTDL_LIBRARY_PATH}"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
-export LTDL_LIBRARY_PATH
exec gnucash-bin "$@"
Modified: gnucash/branches/reshuffle-modules/src/bin/overrides/gnucash-env.in
===================================================================
--- gnucash/branches/reshuffle-modules/src/bin/overrides/gnucash-env.in 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/bin/overrides/gnucash-env.in 2006-12-27 16:54:48 UTC (rev 15263)
@@ -16,11 +16,9 @@
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_MODULE_DIR-@"
LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
-LTDL_LIBRARY_PATH="${EXTRA_LIBS}:${LTDL_LIBRARY_PATH}"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
-export LTDL_LIBRARY_PATH
exec "$@"
Modified: gnucash/branches/reshuffle-modules/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/business/business-core/test/Makefile.am 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/business/business-core/test/Makefile.am 2006-12-27 16:54:48 UTC (rev 15263)
@@ -15,8 +15,7 @@
${top_builddir}/src/engine/libgncmod-engine.la \
../libgncmod-business-core.la \
${GLIB_LIBS} \
- ${QOF_LIBS} \
- -lltdl
+ ${QOF_LIBS}
TESTS = \
test-load-module \
Modified: gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/engine/test/Makefile.am 2006-12-27 16:54:48 UTC (rev 15263)
@@ -17,8 +17,7 @@
../test-core/libgncmod-test-engine.la \
${top_builddir}/src/core-utils/libcore-utils.la \
${GLIB_LIBS} \
- ${QOF_LIBS} \
- -lltdl
+ ${QOF_LIBS}
# these tests are ordered kind more or less in the order
# that they should be executed, with more basic tests coming first.
Modified: gnucash/branches/reshuffle-modules/src/engine/test-core/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/engine/test-core/Makefile.am 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/engine/test-core/Makefile.am 2006-12-27 16:54:48 UTC (rev 15263)
@@ -4,8 +4,7 @@
${top_builddir}/src/gnc-module/libgncmodule.la \
../libgncmod-engine.la \
${GLIB_LIBS} \
- ${QOF_LIBS} \
- -lltdl
+ ${QOF_LIBS}
libgncmod_test_engine_la_SOURCES = gncmod-test-engine.c test-engine-stuff.c
libgncmod_test_engine_la_LDFLAGS = -module
Modified: gnucash/branches/reshuffle-modules/src/gnc-module/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/Makefile.am 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/Makefile.am 2006-12-27 16:54:48 UTC (rev 15263)
@@ -14,8 +14,7 @@
../core-utils/libcore-utils.la \
${top_builddir}/lib/libc/libc-missing.la \
${GUILE_LIBS} \
- ${GLIB_LIBS} \
- -lltdl
+ ${GLIB_LIBS}
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = gnc-module.scm
Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/Makefile.am 2006-12-27 16:54:48 UTC (rev 15263)
@@ -1,6 +1,6 @@
SUBDIRS = mod-foo mod-bar mod-baz misc-mods
-LDADD = ../libgncmodule.la ${GLIB_LIBS} -lltdl ${GUILE_LIBS}
+LDADD = ../libgncmodule.la ${GLIB_LIBS} ${GUILE_LIBS}
AM_CFLAGS = \
-I${top_srcdir}/src \
@@ -44,7 +44,7 @@
test-agedver \
test-dynload
-test_dynload_LDFLAGS = -lltdl ${GUILE_LIBS}
+test_dynload_LDFLAGS = ${GUILE_LIBS}
EXTRA_DIST = \
test-gwrapped-c \
Modified: gnucash/branches/reshuffle-modules/src/gnc-module/test/test-dynload.c
===================================================================
--- gnucash/branches/reshuffle-modules/src/gnc-module/test/test-dynload.c 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/gnc-module/test/test-dynload.c 2006-12-27 16:54:48 UTC (rev 15263)
@@ -1,35 +1,25 @@
/*********************************************************************
* test-dynload.c
* test the ability to dlopen the gnc_module library and initialize
- * it via dlsym
+ * it via dlsym
*********************************************************************/
#include <stdio.h>
-#ifdef G_OS_WIN32
-# undef DLL_EXPORT /* Will cause warnings in ltdl.h if defined */
-# define LIBLTDL_DLL_IMPORT
-#endif
-#include <ltdl.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
-#ifndef lt_ptr
-# define lt_ptr lt_ptr_t
-#endif
-
static void
guile_main(void *closure, int argc, char ** argv)
{
- lt_dlhandle handle;
+ GModule *gmodule;
- lt_dlinit();
-
printf(" test-dynload.c: testing dynamic linking of libgncmodule ...");
- handle = lt_dlopen("libgncmodule.la");
- if(handle) {
- lt_ptr ptr = lt_dlsym(handle, "gnc_module_system_init");
- if(ptr) {
+ gmodule = g_module_open("libgncmodule", 0);
+ if (gmodule) {
+ gpointer ptr;
+ if (g_module_symbol(gmodule, "gnc_module_system_init", &ptr)) {
void (* fn)(void) = ptr;
fn();
printf(" OK\n");
@@ -42,7 +32,7 @@
}
else {
printf(" failed to open library.\n");
- printf("%s\n", lt_dlerror());
+ printf("%s\n", g_module_error());
exit(-1);
}
}
Modified: gnucash/branches/reshuffle-modules/src/import-export/qif-io-core/test/Makefile.am
===================================================================
--- gnucash/branches/reshuffle-modules/src/import-export/qif-io-core/test/Makefile.am 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/import-export/qif-io-core/test/Makefile.am 2006-12-27 16:54:48 UTC (rev 15263)
@@ -1,4 +1,4 @@
-LDADD=${top_builddir}/src/gnc-module/libgncmodule.la ${GLIB_LIBS} -lltdl
+LDADD=${top_builddir}/src/gnc-module/libgncmodule.la ${GLIB_LIBS}
AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
Modified: gnucash/branches/reshuffle-modules/src/valgrind-gnucash.supp
===================================================================
--- gnucash/branches/reshuffle-modules/src/valgrind-gnucash.supp 2006-12-27 14:51:37 UTC (rev 15262)
+++ gnucash/branches/reshuffle-modules/src/valgrind-gnucash.supp 2006-12-27 16:54:48 UTC (rev 15263)
@@ -49,12 +49,6 @@
}
{
- libltdl.so.3(Value1)
- Memcheck:Value1
- obj:/usr/lib/libltdl.so.3
-}
-
-{
libglib-1.2.so.0(Value4)
Memcheck:Value4
fun:g_hash_table_lookup
More information about the gnucash-changes
mailing list