|
 |
192ec7 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
192ec7 |
index c582a62..18ee5bb 100644
|
|
|
192ec7 |
--- a/Makefile.am
|
|
|
192ec7 |
+++ b/Makefile.am
|
|
|
192ec7 |
@@ -6,11 +6,8 @@
|
|
|
192ec7 |
##
|
|
|
192ec7 |
|
|
|
192ec7 |
AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
|
|
|
192ec7 |
-DIST_SUBDIRS = compat lib libltdl scripts icons errors contrib doc helpers src test-suite tools
|
|
|
192ec7 |
+DIST_SUBDIRS = compat lib scripts icons errors contrib doc helpers src test-suite tools
|
|
|
192ec7 |
SUBDIRS = compat lib
|
|
|
192ec7 |
-if ENABLE_LOADABLE_MODULES
|
|
|
192ec7 |
-SUBDIRS += libltdl
|
|
|
192ec7 |
-endif
|
|
|
192ec7 |
SUBDIRS += scripts icons errors doc helpers src tools test-suite
|
|
|
192ec7 |
|
|
|
192ec7 |
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
|
|
|
192ec7 |
diff --git a/Makefile.in b/Makefile.in
|
|
|
192ec7 |
index 09c9304..dad017b 100644
|
|
|
192ec7 |
--- a/Makefile.in
|
|
|
192ec7 |
+++ b/Makefile.in
|
|
|
192ec7 |
@@ -87,7 +87,7 @@ PRE_UNINSTALL = :
|
|
|
192ec7 |
POST_UNINSTALL = :
|
|
|
192ec7 |
build_triplet = @build@
|
|
|
192ec7 |
host_triplet = @host@
|
|
|
192ec7 |
-@ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl
|
|
|
192ec7 |
+#@ENABLE_LOADABLE_MODULES_TRUE@am__append_1 = libltdl
|
|
|
192ec7 |
subdir = .
|
|
|
192ec7 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
|
192ec7 |
am__aclocal_m4_deps = $(top_srcdir)/acinclude/ax_with_prog.m4 \
|
|
|
192ec7 |
@@ -493,7 +493,7 @@ top_build_prefix = @top_build_prefix@
|
|
|
192ec7 |
top_builddir = @top_builddir@
|
|
|
192ec7 |
top_srcdir = @top_srcdir@
|
|
|
192ec7 |
AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
|
|
|
192ec7 |
-DIST_SUBDIRS = compat lib libltdl scripts icons errors contrib doc helpers src test-suite tools
|
|
|
192ec7 |
+DIST_SUBDIRS = compat lib scripts icons errors contrib doc helpers src test-suite tools
|
|
|
192ec7 |
SUBDIRS = compat lib $(am__append_1) scripts icons errors doc helpers \
|
|
|
192ec7 |
src tools test-suite
|
|
|
192ec7 |
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
|
|
|
192ec7 |
diff --git a/aclocal.m4 b/aclocal.m4
|
|
|
192ec7 |
index 4dd204a..b66d5aa 100644
|
|
|
192ec7 |
--- a/aclocal.m4
|
|
|
192ec7 |
+++ b/aclocal.m4
|
|
|
192ec7 |
@@ -108,7 +108,7 @@ _LT_SET_OPTIONS([$0], [$1])
|
|
|
192ec7 |
LIBTOOL_DEPS=$ltmain
|
|
|
585267 |
|
|
|
585267 |
# Always use our own libtool.
|
|
|
585267 |
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
|
585267 |
+LIBTOOL='$(SHELL) libtool'
|
|
|
585267 |
AC_SUBST(LIBTOOL)dnl
|
|
|
585267 |
|
|
|
585267 |
_LT_SETUP
|
|
|
192ec7 |
diff --git a/configure b/configure
|
|
|
192ec7 |
index ba4a984..6926f03 100755
|
|
|
192ec7 |
--- a/configure
|
|
|
192ec7 |
+++ b/configure
|
|
|
192ec7 |
@@ -11551,7 +11551,7 @@ esac
|
|
|
192ec7 |
LIBTOOL_DEPS=$ltmain
|
|
|
585267 |
|
|
|
585267 |
# Always use our own libtool.
|
|
|
585267 |
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
|
585267 |
+LIBTOOL='$(SHELL) libtool'
|
|
|
585267 |
|
|
|
585267 |
|
|
|
585267 |
|