[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r9725: build libtool2 in it's own di
|
From: |
rob |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r9725: build libtool2 in it's own directory. Make distcheck work again using either libtool 1.5.x or 2.2.6. |
|
Date: |
Thu, 11 Sep 2008 16:51:32 -0600 |
|
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 9725
committer: address@hidden
branch nick: trunk
timestamp: Thu 2008-09-11 16:51:32 -0600
message:
build libtool2 in it's own directory. Make distcheck work again using either
libtool 1.5.x or 2.2.6.
removed:
libbase/libltdl.am
modified:
Makefile.am
autogen.sh
configure.ac
libbase/Makefile.am
=== modified file 'Makefile.am'
--- a/Makefile.am 2008-09-11 04:17:20 +0000
+++ b/Makefile.am 2008-09-11 22:51:32 +0000
@@ -55,11 +55,15 @@
po \
$(NULL)
+if LIBLTDL2
+LIBLTDLDIR = libltdl
+endif
+
if CYGNAL
CYGNAL_DIR = cygnal
endif
-SUBDIRS = $(STD_DIRS) $(CYGNAL_DIR)
+SUBDIRS = $(LIBLTDLDIR) $(STD_DIRS) $(CYGNAL_DIR)
if TESTSUITE
SUBDIRS += testsuite
@@ -71,7 +75,7 @@
# man_MANS = doc/gnash.1 doc/gprocessor.1 doc/dumpshm.1 soldumper.1
-DIST_SUBDIRS = $(STD_DIRS) cygnal extensions testsuite
+DIST_SUBDIRS = $(LIBLTDLDIR) $(STD_DIRS) cygnal extensions testsuite
EXTRA_DIST = autogen.sh \
config.rpath \
=== modified file 'autogen.sh'
--- a/autogen.sh 2008-09-11 04:15:26 +0000
+++ b/autogen.sh 2008-09-11 22:51:32 +0000
@@ -125,18 +125,18 @@
ltdlver=`${LIBTOOLIZE:-libtoolize} --version | head -1 | cut -d ' ' -f 4`
ltdlmajor=`echo $ltdlver | cut -d '.' -f 1`
if test -z "$NO_LIBTOOLIZE" ; then
- ltbasedir="libbase/libltdl"
+ ltbasedir="libltdl"
libtoolflags="--force --copy --ltdl"
if test $ltdlmajor -eq 2; then
- libtoolflags="${libtoolflags} ${ltbasedir} --quiet --nonrecursive"
+ libtoolflags="${libtoolflags} ${ltbasedir} --quiet --recursive"
fi
echo "Running libtoolize $ltdlver ${libtoolflags} ..."
if ${LIBTOOLIZE:-libtoolize} ${libtoolflags}; then
# libtool insists on including config.h, but we use gnashconfig.h
# to avoid any problems, so we have to change this include
# so they all reference the right config header file.
- if test -d libltdl; then
- for i in libltdl/*.c; do
+ if test -d libltdl; then
+ for i in libltdl/*.c; do
# echo "Fixing $i..."
mv $i $i.orig
sed -e 's/include <config.h>/include <gnashconfig.h>/' $i.orig > $i
@@ -144,6 +144,13 @@
fi
# mv libltdl/ltdl.c libltdl/ltdl.c.orig
# sed -e 's/include <config.h>/include <gnashconfig.h>/'
libltdl/ltdl.c.orig > libltdl/ltdl.c
+ # for libtool 1.x, we don't build in libltdl, it's built in libbase
instead. autoconf doesn't like
+ # conditional output files, so we nuke the original libltdl/Makefile.am
and replace it with a zero
+ # sized one to keep autoconf happy.
+ if test $ltdlmajor -eq 1; then
+ mv libltdl/Makefile.am Makefile.am.orig
+ touch libltdl/Makefile.am
+ fi
if test -f ${ltbasedir}/config-h.in; then
chmod a+w ${ltbasedir}/config-h.in # Darwin needs this
fi
=== modified file 'configure.ac'
--- a/configure.ac 2008-09-11 04:17:20 +0000
+++ b/configure.ac 2008-09-11 22:51:32 +0000
@@ -20,7 +20,7 @@
AC_CONFIG_SRCDIR(libcore/gnash.h)
AM_CONFIG_HEADER(gnashconfig.h)
-dnl AC_CANONICAL_TARGET
+dnl AC_CONFIG_SUBDIRS(libltdl)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
@@ -865,19 +865,20 @@
ltmajor=`echo $ltver | cut -d '.' -f 1`
AC_MSG_RESULT([$ltver])
if test $ltmajor -eq 1; then
-AC_LIBLTDL_INSTALLABLE
+AC_LIBLTDL_CONVENIENCE
AC_LIBTOOL_DLOPEN
AC_LIBTOOL_WIN32_DLL
+AC_DISABLE_STATIC
else
-LT_INIT([dlopen win32-dll])
-LTDL_INSTALLABLE
-lt_ltdl_dir=libbase/libltdl
-LTDL_INIT([installable nonrecursive])
+LT_INIT([dlopen win32-dll disable-static])
+dnl lt_ltdl_dir=libbase/libltdlL
+LTDL_INIT([convenience recursive])
+AC_CONFIG_FILES([libltdl/Makefile])
fi
AC_PROG_LIBTOOL
AM_CONDITIONAL(LIBLTDL2, [test $ltmajor -eq 2])
-AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install}" = xyes)
-AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience}" = xyes)
+AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
+AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
AC_C_CONST
AC_C_INLINE
=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am 2008-09-08 15:04:44 +0000
+++ b/libbase/Makefile.am 2008-09-11 22:51:32 +0000
@@ -21,8 +21,7 @@
pluginsdir = $(prefix)/lib/gnash/plugins
if INSTALL_LTDL
-if LIBLTDL2
-else
+if !LIBLTDL2
include_HEADERS = $(top_srcdir)/libltdl/ltdl.h
LIBLTDLLIB = libltdl.la
LIBLTDLHEAD = $(top_srcdir)/libltdl/ltdl.h
@@ -167,15 +166,12 @@
libgnashbase_la_LDFLAGS = -release $(VERSION)
-if LIBLTDL2
-include $(srcdir)/libltdl.am
-else
+if !LIBLTDL2
libltdlc_la_CPPFLAGS = $(LTDLINCL) -I$(top_srcdir)/libltdl
if CONVENIENCE_LTDL
noinst_LTLIBRARIES = libltdlc.la
libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
endif
-CLEANFILES = libltdl.la libltdlc.la gnashrc gnashpluginrc
libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
@@ -185,6 +181,7 @@
libltdl_la_LDFLAGS += -static
endif
endif
+CLEANFILES = libltdl.la libltdlc.la gnashrc gnashpluginrc
# Rebuild with GCC 4.x Mudflap support
mudflap:
=== removed file 'libbase/libltdl.am'
--- a/libbase/libltdl.am 2008-09-11 04:14:05 +0000
+++ b/libbase/libltdl.am 1970-01-01 00:00:00 +0000
@@ -1,149 +0,0 @@
-## Makefile.inc -- includable Makefile.am snippet
-##
-## Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
-## Written by Gary V. Vaughan, 2003
-##
-## NOTE: The canonical source of this file is maintained with the
-## GNU Libtool package. Report bugs to address@hidden
-##
-## GNU Libltdl is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2 of the License, or (at your option) any later version.
-##
-## As a special exception to the GNU Lesser General Public License,
-## if you distribute this file as part of a program or library that
-## is built using GNU libtool, you may include this file under the
-## same distribution terms that you use for the rest of that program.
-##
-## GNU Libltdl is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU LesserGeneral Public
-## License along with GNU Libltdl; see the file COPYING.LIB. If not, a
-## copy can be downloaded from http://www.gnu.org/licenses/lgpl.html,
-## or obtained by writing to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#####
-
-## DO NOT REMOVE THIS LINE -- make depends on it
-
-VPATH+=:$(top_srcdir)/libltdl
-
-# -I$(srcdir) is needed for user that built libltdl with a sub-Automake
-# (not as a sub-package!) using 'nostdinc':
-AM_CPPFLAGS = -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
- -DLTDL -I. -I$(srcdir) -Ilibltdl \
- -I$(srcdir)/libltdl -I$(srcdir)/libltdl/libltdl
-AM_LDFLAGS = -no-undefined
-LTDL_VERSION_INFO = -version-info 9:0:0
-
-noinst_LTLIBRARIES = $(LT_DLLOADERS)
-
-if INSTALL_LTDL
-ltdlincludedir = $(includedir)/libltdl
-ltdlinclude_HEADERS = $(srcdir)/libltdl/libltdl/lt_system.h \
- $(srcdir)/libltdl/libltdl/lt_error.h \
- $(srcdir)/libltdl/libltdl/lt_dlloader.h
-include_HEADERS = $(srcdir)/libltdl/ltdl.h
-lib_LTLIBRARIES = libltdl/libltdl.la
-endif
-
-if CONVENIENCE_LTDL
-noinst_LTLIBRARIES += libltdl/libltdlc.la
-endif
-
-libltdl_libltdl_la_SOURCES = $(srcdir)/libltdl/libltdl/lt__alloc.h \
- $(srcdir)/libltdl/libltdl/lt__dirent.h \
- $(srcdir)/libltdl/libltdl/lt__glibc.h \
- $(srcdir)/libltdl/libltdl/lt__private.h \
- $(srcdir)/libltdl/libltdl/lt__strl.h \
- $(srcdir)/libltdl/libltdl/lt_dlloader.h \
- $(srcdir)/libltdl/libltdl/lt_error.h \
- $(srcdir)/libltdl/libltdl/lt_system.h \
- $(srcdir)/libltdl/libltdl/slist.h \
- $(srcdir)/libltdl/loaders/preopen.c \
- $(srcdir)/libltdl/lt__alloc.c \
- $(srcdir)/libltdl/lt_dlloader.c \
- $(srcdir)/libltdl/lt_error.c \
- $(srcdir)/libltdl/ltdl.c \
- $(srcdir)/libltdl/ltdl.h \
- $(srcdir)/libltdl/slist.c
-
-EXTRA_DIST += $(srcdir)/libltdl/lt__dirent.c \
- $(srcdir)/libltdl/lt__strl.c
-
-libltdl_libltdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS)
-libltdl_libltdl_la_LDFLAGS = $(AM_LDFLAGS) $(LTDL_VERSION_INFO)
$(LT_DLPREOPEN)
-libltdl_libltdl_la_LIBADD = #$(ltdl_LTLIBOBJS)
-libltdl_libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) # $(ltdl_LTLIBOBJS)
$(EXTRA_DIST)
-
-libltdl_libltdlc_la_SOURCES = $(libltdl_libltdl_la_SOURCES)
-libltdl_libltdlc_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN)c $(AM_CPPFLAGS)
-libltdl_libltdlc_la_LDFLAGS = $(AM_LDFLAGS) $(LT_DLPREOPEN)
-libltdl_libltdlc_la_LIBADD = $(libltdl_libltdl_la_LIBADD)
-libltdl_libltdlc_la_DEPENDENCIES= $(libltdl_libltdl_la_DEPENDENCIES)
-
-## The loaders are preopened by libltdl, itself always built from
-## pic-objects (either as a shared library, or a convenience library),
-## so the loaders themselves must be made from pic-objects too. We
-## use convenience libraries for that purpose:
-EXTRA_LTLIBRARIES = libltdl/dlopen.la \
- libltdl/dld_link.la \
- libltdl/dyld.la \
- libltdl/load_add_on.la \
- libltdl/loadlibrary.la \
- libltdl/shl_load.la
-
-libltdl_dlopen_la_SOURCES = $(srcdir)/libltdl/loaders/dlopen.c
-libltdl_dlopen_la_LDFLAGS = -module -avoid-version
-libltdl_dlopen_la_LIBADD = $(LIBADD_DLOPEN)
-
-libltdl_dld_link_la_SOURCES = $(srcdir)/libltdl/loaders/dld_link.c
-libltdl_dld_link_la_LDFLAGS = -module -avoid-version
-libltdl_dld_link_la_LIBADD = -ldld
-
-libltdl_dyld_la_SOURCES = $(srcdir)/libltdl/loaders/dyld.c
-libltdl_dyld_la_LDFLAGS = -module -avoid-version
-
-libltdl_load_add_on_la_SOURCES = $(srcdir)/libltdl/loaders/load_add_on.c
-libltdl_load_add_on_la_LDFLAGS = -module -avoid-version
-
-libltdl_loadlibrary_la_SOURCES = $(srcdir)/libltdl/loaders/loadlibrary.c
-libltdl_loadlibrary_la_LDFLAGS = -module -avoid-version
-
-libltdl_shl_load_la_SOURCES = $(srcdir)/libltdl/loaders/shl_load.c
-libltdl_shl_load_la_LDFLAGS = -module -avoid-version
-libltdl_shl_load_la_LIBADD = $(LIBADD_SHL_LOAD)
-
-## Make sure these will be cleaned even when they're not built by default:
-CLEANFILES = libltdl/libltdl.la \
- libltdl/libltdlc.la \
- libltdl/libdlloader.la
-
-## Automake-1.9.6 doesn't clean subdir AC_LIBOBJ compiled objects
-## automatically:
-CLEANFILES += $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)
-
-EXTRA_DIST += $(srcdir)/libltdl/COPYING.LIB \
- $(srcdir)/libltdl/README
-
-## --------------------------- ##
-## Gnulib Makefile.am snippets ##
-## --------------------------- ##
-
-BUILT_SOURCES = $(srcdir)/libltdl/$(ARGZ_H)
-EXTRA_DIST += $(srcdir)/libltdl/argz_.h \
- $(srcdir)/libltdl/argz.c
-
-# We need the following in order to create an <argz.h> when the system
-# doesn't have one that works with the given compiler.
-all-local $(lib_OBJECTS): $(srcdir)/libltdl/$(ARGZ_H)
-libltdl/argz.h: libltdl/argz_.h
- $(mkinstalldirs) . libltdl/
- cp $(srcdir)/libltdl/argz_.h address@hidden
- mv address@hidden $@
-MOSTLYCLEANFILES = $(srcdir)/libltdl/argz.h \
- $(srcdir)/libltdl/argz.h-t
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r9725: build libtool2 in it's own directory. Make distcheck work again using either libtool 1.5.x or 2.2.6.,
rob <=