[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
where libltdl will be libtoolized
From: |
Ralf Wildenhues |
Subject: |
where libltdl will be libtoolized |
Date: |
Fri, 19 Nov 2004 21:06:14 +0100 |
User-agent: |
Mutt/1.5.6+20040722i |
Current state of libtldl branch-2-0 is inconsistent:
libtoolize --ltdl=some/sub/dir
will not work. The include paths in ltdl.h
| ltdl.h:#include <libltdl/lt_system.h>
| ltdl.h:#include <libltdl/lt_error.h>
| ltdl.h:#include <libltdl/lt_dlloader.h>
and libltdl/Makefile.am's
| AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
will conflict in a package which uses libltdl.
We have to decide: Either the `libtoolize --ltdl' argument must
end in `libltdl', or we need to provide a flat directory structure.
(Note that this stems from the requirement to be able to either use
an installed libltdl or a package-internal one, with the repective other
one absent).
I like the former better for several reasons:
- better forward compatibility from 1.5 (maybe)
- supposedly less trouble when within a larger collection of
sub-packages.
- People much rather like to bury autotools in some directory
structure whose top they decide and the innards they could care less.
Anybody know packages using libltdl with a different strategy already
(which would then conflict)?
So, OK to apply this patch?
Doesn't the config.h header still pose problems? I think not but am not
so sure.
Oh, and this patch blissfully ignores the new non-recursive Automake
setup possibilities. Anyone who knows a solution respecting this as
well as compatibility with older Automake's please go right ahead.
Regards,
Ralf
2004-11-19 Ralf Wildenhues <address@hidden>
* libltdl/Makefile.am, libltdl/loaders/Makefile.am: Trim
and fix AM_CPPFLAGS to work in other packages.
libltdl/slist.c: include lt_system.h without relpath.
doc/libtool.texi (Invoking libtoolize): Document libltdl
path requirement.
Index: doc/libtool.texi
===================================================================
RCS file: /cvsroot/libtool/libtool/doc/libtool.texi,v
retrieving revision 1.172.2.11
diff -u -r1.172.2.11 libtool.texi
--- doc/libtool.texi 19 Nov 2004 11:34:09 -0000 1.172.2.11
+++ doc/libtool.texi 19 Nov 2004 19:48:35 -0000
@@ -2200,7 +2200,7 @@
@code{LT_WITH_LTDL}; @code{LTDL_CONVENIENCE};
@code{LTDL_INSTALLABLE} (@pxref{Distributing libltdl}). Without
an argument, @samp{libltdl} is used as the default target directory
-name.
+name. The argument has to have @samp{libltdl} as last path component.
@item --quiet
@itemx -q
cvs diff: Diffing libltdl
Index: libltdl/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.am,v
retrieving revision 1.64.2.1
diff -u -r1.64.2.1 Makefile.am
--- libltdl/Makefile.am 15 Nov 2004 00:52:00 -0000 1.64.2.1
+++ libltdl/Makefile.am 19 Nov 2004 19:48:36 -0000
@@ -27,7 +27,7 @@
ACLOCAL_AMFLAGS = -I m4
DEFS = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/..
AM_LDFLAGS = -no-undefined
VERSION_INFO = -version-info 6:0:0
Index: libltdl/slist.h
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/slist.h,v
retrieving revision 1.4
diff -u -r1.4 slist.h
--- libltdl/slist.h 3 Oct 2004 13:50:10 -0000 1.4
+++ libltdl/slist.h 19 Nov 2004 19:48:36 -0000
@@ -41,7 +41,7 @@
#define SLIST_H 1
#if defined(LTDL)
-# include <libltdl/lt_system.h>
+# include "lt_system.h"
#else
# define LT_SCOPE
#endif
Index: libltdl/loaders/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/loaders/Makefile.am,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 Makefile.am
--- libltdl/loaders/Makefile.am 15 Nov 2004 00:52:00 -0000 1.3.2.1
+++ libltdl/loaders/Makefile.am 19 Nov 2004 19:48:36 -0000
@@ -24,8 +24,8 @@
AUTOMAKE_OPTIONS = foreign
DEFS = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
- -I.. -I$(srcdir)/..
+AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/.. \
+ -I$(srcdir)/../..
AM_LDFLAGS = -no-undefined -module -avoid-version -export-dynamic
pkgincludedir = $(includedir)/libltdl
- where libltdl will be libtoolized,
Ralf Wildenhues <=