FYI: move ltdl headers to allow arbitrary --ltdl paths [libtool--release--2.0--patch-85]

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This is a merge of Peter's recent patch to HEAD, since the bug it fixes
is present on branch-2-0 too!

Applied to branch-2-0.

  * looking for address@hidden/libtool--release--2.0--patch-84 to compare with
  * comparing to address@hidden/libtool--release--2.0--patch-84
  A/ libltdl/libltdl
  A/ libltdl/libltdl/.arch-ids
  A  libltdl/libltdl/.arch-ids/=id
  A  
{arch}/libtool/libtool--devo/libtool--devo--1.0/address@hidden/patch-log/patch-321
  M  ChangeLog
  M  libltdl/Makefile.am
  M  libltdl/loaders/Makefile.am
  => libltdl/.arch-ids/lt__alloc.h.id   libltdl/libltdl/.arch-ids/lt__alloc.h.id
  => libltdl/.arch-ids/lt__dirent.h.id  
libltdl/libltdl/.arch-ids/lt__dirent.h.id
  => libltdl/.arch-ids/lt__glibc.h.id   libltdl/libltdl/.arch-ids/lt__glibc.h.id
  => libltdl/.arch-ids/lt__private.h.id 
libltdl/libltdl/.arch-ids/lt__private.h.id
  => libltdl/.arch-ids/lt_dlloader.h.id 
libltdl/libltdl/.arch-ids/lt_dlloader.h.id
  => libltdl/.arch-ids/lt_error.h.id    libltdl/libltdl/.arch-ids/lt_error.h.id
  => libltdl/.arch-ids/lt_system.h.id   libltdl/libltdl/.arch-ids/lt_system.h.id
  => libltdl/.arch-ids/ltdl.h.id        libltdl/libltdl/.arch-ids/ltdl.h.id
  => libltdl/.arch-ids/slist.h.id       libltdl/libltdl/.arch-ids/slist.h.id
  => libltdl/lt__alloc.h        libltdl/libltdl/lt__alloc.h
  => libltdl/lt__dirent.h       libltdl/libltdl/lt__dirent.h
  => libltdl/lt__glibc.h        libltdl/libltdl/lt__glibc.h
  => libltdl/lt__private.h      libltdl/libltdl/lt__private.h
  => libltdl/lt_dlloader.h      libltdl/libltdl/lt_dlloader.h
  => libltdl/lt_error.h libltdl/libltdl/lt_error.h
  => libltdl/lt_system.h        libltdl/libltdl/lt_system.h
  => libltdl/ltdl.h     libltdl/libltdl/ltdl.h
  => libltdl/slist.h    libltdl/libltdl/slist.h
  
  * modified files
  
  Index: Changelog
  2004-11-23  Peter O'Gorman  <address@hidden>
  
        Do not require that libtoolize --ltdl=/some/path end in libltdl. Move
        most libltdl headers to libtldl/libltdl to allow 
        #include <libltdl/ltdl.h> to always work.
  
        * libltdl/Makefile.am, libltdl/loaders/Makefile.am: Look for includes
        in the new location.
        * libltdl/libltdl/lt__alloc.h, libltdl/libltdl/lt__dirent.h, 
        libltdl/libltdl/lt__glibc.h, libltdl/libltdl/lt__private.h,
        libltdl/libltdl/lt_dlloader.h, libltdl/libltdl/lt_error.h,
        libltdl/libltdl/lt_system.h, libltdl/libltdl/ltdl.h,
        libltdl/libltdl/slist.h: Added files, moved from libtdl/.
        * libltdl/lt__alloc.h, libltdl/lt__dirent.h, libltdl/lt__glibc.h,
        libltdl/lt__private.h, libltdl/lt_dlloader.h, libltdl/lt_error.h,
        libltdl/lt_system.h, libltdl/ltdl.h, libltdl/slist.h: Removed, moved
        to libltdl/libltdl.
  
  from  Ralf Wildenhues <address@hidden>
  --- orig/libltdl/Makefile.am
  +++ mod/libltdl/Makefile.am
  @@ -27,26 +27,27 @@
   ACLOCAL_AMFLAGS              = -I m4
   
   DEFS                 = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
  -AM_CPPFLAGS          = -I$(top_builddir) -I$(top_srcdir)
  +AM_CPPFLAGS          = -I$(builddir) -I$(srcdir) -I$(srcdir)/libltdl
   AM_LDFLAGS           = -no-undefined
   VERSION_INFO         = -version-info 6:0:0
   
   pkgincludedir                = $(includedir)/libltdl
   
   lib_LTLIBRARIES              = libdlloader.la
  -libdlloader_la_SOURCES  = lt_error.h lt_error.c \
  -                       lt__private.h lt_system.h \
  -                       lt__alloc.h lt__alloc.c \
  -                       lt__glibc.h \
  -                       lt__dirent.h \
  -                       slist.h slist.c
  +libdlloader_la_SOURCES  = libltdl/lt_error.h lt_error.c \
  +                       libltdl/lt__private.h libltdl/lt_system.h \
  +                       libltdl/lt__alloc.h lt__alloc.c \
  +                       libltdl/lt__glibc.h \
  +                       libltdl/lt__dirent.h \
  +                       libltdl/slist.h slist.c
   libdlloader_la_LDFLAGS       = $(VERSION_INFO)
   libdlloader_la_LIBADD        = $(LTLIBOBJS)
   
   ## Libltdl brings it all together:
   if INSTALL_LTDL
  -include_HEADERS              = ltdl.h
  -pkginclude_HEADERS   = lt_system.h lt_error.h lt_dlloader.h
  +include_HEADERS              = libltdl/ltdl.h
  +pkginclude_HEADERS   = libltdl/lt_system.h libltdl/lt_error.h \
  +                       libltdl/lt_dlloader.h
   lib_LTLIBRARIES              += libltdl.la
   endif
   
  @@ -54,8 +55,8 @@
   noinst_LTLIBRARIES   = libltdlc.la
   endif
   
  -libltdl_la_SOURCES   = ltdl.h ltdl.c \
  -                       lt_dlloader.h lt_dlloader.c loaders/preopen.c
  +libltdl_la_SOURCES   = libltdl/ltdl.h ltdl.c \
  +                       libltdl/lt_dlloader.h lt_dlloader.c loaders/preopen.c
   libltdl_la_CPPFLAGS  = -DLTDLOPEN=libltdl $(AM_CPPFLAGS)
   libltdl_la_LDFLAGS   =  $(VERSION_INFO) $(LT_DLPREOPEN)
   libltdl_la_LIBADD    = libdlloader.la
  @@ -70,7 +71,8 @@
   ltdldatadir          = $(pkgdatadir)/libltdl
   nobase_ltdldata_DATA = COPYING.LIB Makefile.am README configure.ac \
                          $(libltdl_la_SOURCES) $(libdlloader_la_SOURCES) \
  -                       lt__dirent.c lt__dirent.h argz_.h argz.c
  +                       lt__dirent.c libltdl/lt__dirent.h \
  +                       argz_.h argz.c
   
   ## Make sure these will be cleaned even when they're not built by default:
   CLEANFILES           = libltdl.la libltdlc.la libdlloader.la
  
  
  --- orig/libltdl/loaders/Makefile.am
  +++ mod/libltdl/loaders/Makefile.am
  @@ -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$(top_srcdir)  \
  +                       -I.. -I$(srcdir)/.. -I$(srcdir)/../libltdl
   AM_LDFLAGS           = -no-undefined -module -avoid-version -export-dynamic
   
   pkgincludedir                = $(includedir)/libltdl
  
  
  
  * added files
  
  --- /dev/null
  +++ 
/Users/gary/devel/savannah/libtool--release--2.0/,,address@hidden/new-files-archive/./libltdl/libltdl/.arch-ids/=id
  @@ -0,0 +1 @@
  +Gary V. Vaughan <address@hidden> Tue Nov 23 12:32:50 2004 18107.0
  --- /dev/null
  +++ 
/Users/gary/devel/savannah/libtool--release--2.0/,,address@hidden/new-files-archive/./{arch}/libtool/libtool--devo/libtool--devo--1.0/address@hidden/patch-log/patch-321
  @@ -0,0 +1,46 @@
  +Revision: libtool--devo--1.0--patch-321
  +Archive: address@hidden
  +Creator: Gary V. Vaughan <address@hidden>
  +Date: Tue Nov 23 12:34:00 GMT 2004
  +Standard-date: 2004-11-23 12:34:00 GMT
  +New-files: libltdl/libltdl/.arch-ids/=id
  +New-directories: libltdl/libltdl libltdl/libltdl/.arch-ids
  +Renamed-files: libltdl/.arch-ids/lt__alloc.h.id 
libltdl/libltdl/.arch-ids/lt__alloc.h.id
  +    libltdl/.arch-ids/lt__dirent.h.id 
libltdl/libltdl/.arch-ids/lt__dirent.h.id
  +    libltdl/.arch-ids/lt__glibc.h.id libltdl/libltdl/.arch-ids/lt__glibc.h.id
  +    libltdl/.arch-ids/lt__private.h.id 
libltdl/libltdl/.arch-ids/lt__private.h.id
  +    libltdl/.arch-ids/lt_dlloader.h.id 
libltdl/libltdl/.arch-ids/lt_dlloader.h.id
  +    libltdl/.arch-ids/lt_error.h.id libltdl/libltdl/.arch-ids/lt_error.h.id
  +    libltdl/.arch-ids/lt_system.h.id libltdl/libltdl/.arch-ids/lt_system.h.id
  +    libltdl/.arch-ids/ltdl.h.id libltdl/libltdl/.arch-ids/ltdl.h.id
  +    libltdl/.arch-ids/slist.h.id libltdl/libltdl/.arch-ids/slist.h.id
  +    libltdl/lt__alloc.h libltdl/libltdl/lt__alloc.h
  +    libltdl/lt__dirent.h libltdl/libltdl/lt__dirent.h
  +    libltdl/lt__glibc.h libltdl/libltdl/lt__glibc.h
  +    libltdl/lt__private.h libltdl/libltdl/lt__private.h
  +    libltdl/lt_dlloader.h libltdl/libltdl/lt_dlloader.h
  +    libltdl/lt_error.h libltdl/libltdl/lt_error.h
  +    libltdl/lt_system.h libltdl/libltdl/lt_system.h
  +    libltdl/ltdl.h libltdl/libltdl/ltdl.h
  +    libltdl/slist.h libltdl/libltdl/slist.h
  +Modified-files: ChangeLog libltdl/Makefile.am
  +    libltdl/loaders/Makefile.am
  +New-patches: address@hidden/libtool--devo--1.0--patch-321
  +Summary: move ltdl headers to allow arbitrary --ltdl paths
  +Keywords: 
  +
  +Do not require that libtoolize --ltdl=/some/path end in libltdl. Move
  +most libltdl headers to libtldl/libltdl to allow 
  +#include <libltdl/ltdl.h> to always work.
  +
  +* libltdl/Makefile.am, libltdl/loaders/Makefile.am: Look for includes
  +in the new location.
  +* libltdl/libltdl/lt__alloc.h, libltdl/libltdl/lt__dirent.h, 
  +libltdl/libltdl/lt__glibc.h, libltdl/libltdl/lt__private.h,
  +libltdl/libltdl/lt_dlloader.h, libltdl/libltdl/lt_error.h,
  +libltdl/libltdl/lt_system.h, libltdl/libltdl/ltdl.h,
  +libltdl/libltdl/slist.h: Added files, moved from libtdl/.
  +* libltdl/lt__alloc.h, libltdl/lt__dirent.h, libltdl/lt__glibc.h,
  +libltdl/lt__private.h, libltdl/lt_dlloader.h, libltdl/lt_error.h,
  +libltdl/lt_system.h, libltdl/ltdl.h, libltdl/slist.h: Removed, moved
  +to libltdl/libltdl.
  
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFBozDQFRMICSmD1gYRArqhAJ4yoO7lx1lm6v9HBGL+BTDEIYRDkACeO+kn
enBtMPa3uYxMtVfBsB+jCOU=
=Vjp1
-----END PGP SIGNATURE-----