* libiberty/configure.gnu: New. Pass `--enable-shared' to configure, unless told otherwise. * libiberty.mk (EXTRA_DIST): Add libiberty/configure.gnu. * src/Makefile.am (libextatica_la_LIBADD): Replace $(top_builddir)/libiberty/libiberty.a with $(top_builddir)/libiberty/pic/libiberty.a. --- extatica/ChangeLog | 11 +++++++++++ extatica/libiberty.mk | 3 +++ extatica/{ => libiberty}/configure.gnu | 19 +++++++++---------- extatica/src/Makefile.am | 2 +- 4 files changed, 24 insertions(+), 11 deletions(-) copy extatica/{ => libiberty}/configure.gnu (65%) mode change 100644 => 100755 diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 2a0e684..ca5bca6 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,3 +1,14 @@ +2010-11-15 Roland Levillain <roland@lrde.epita.fr> + + Build Libiberty as a shared library. + + * libiberty/configure.gnu: New. + Pass `--enable-shared' to configure, unless told otherwise. + * libiberty.mk (EXTRA_DIST): Add libiberty/configure.gnu. + * src/Makefile.am (libextatica_la_LIBADD): Replace + $(top_builddir)/libiberty/libiberty.a with + $(top_builddir)/libiberty/pic/libiberty.a. + 2010-11-09 Roland Levillain <roland@lrde.epita.fr> Mention Libiberty in Extatica's AUTHORS, NEWS and README. diff --git a/extatica/libiberty.mk b/extatica/libiberty.mk index 8f8b0be..c803e96 100644 --- a/extatica/libiberty.mk +++ b/extatica/libiberty.mk @@ -126,3 +126,6 @@ EXTRA_DIST += \ # These scripts are required by Libiberty's build system. EXTRA_DIST += mkinstalldirs move-if-change + +# `configure' wrapper used in recursive configuration. +EXTRA_DIST += libiberty/configure.gnu diff --git a/extatica/configure.gnu b/extatica/libiberty/configure.gnu old mode 100644 new mode 100755 similarity index 65% copy from extatica/configure.gnu copy to extatica/libiberty/configure.gnu index 09a9463..a463862 --- a/extatica/configure.gnu +++ b/extatica/libiberty/configure.gnu @@ -11,15 +11,15 @@ # Is option checking disabled? no_option_checking_p=false -# Is ``--with-milena' not provided? -no_milena_p=true +# Is `--disable-shared' (or `--enable-shared=no') not provided? +no_disable_shared_p=true for i; do case "$i" in # First try to get SRCDIR from a possible `--srcdir' argument. --srcdir=*) srcdir=`echo "$i" | sed 's/^--srcdir=//'`;; --disable-option-checking) no_option_checking_p=true;; - --with-milena*) no_milena_p=false;; + --disable-shared|--enable-shared=no) no_disable_shared_p=false;; esac done @@ -27,13 +27,12 @@ done test x"${srcdir+set}" != xset && srcdir=`dirname $0` # Disabled option checking is a hint that this `configure.gnu' was -# called from a parent `configure'. If so, and if no `--with-milena' -# option was provided, pass our own `--with-milena' option to the -# recursive call to the actual `configure', carrying the path to -# Milena's source directory. -if $no_option_checking_p && $no_milena_p; then - milena_dir=`cd "$srcdir/../milena" && pwd` - exec "$srcdir/configure" ${1+"$@"} "--with-milena=$milena_dir" +# called from a parent `configure'. If so, and if no +# `--disable-shared' (or `--enable-shared=no') option was provided, +# pass our own `--enable-shared' option to the recursive call to the +# actual `configure'. +if $no_option_checking_p && $no_disable_shared_p; then + exec "$srcdir/configure" ${1+"$@"} --enable-shared else exec "$srcdir/configure" ${1+"$@"} fi diff --git a/extatica/src/Makefile.am b/extatica/src/Makefile.am index ed6830a..00bac51 100644 --- a/extatica/src/Makefile.am +++ b/extatica/src/Makefile.am @@ -82,7 +82,7 @@ libextatica_la_LIBADD = \ $(RUBY_LIBRUBYARG_SHARED) \ $(LIBLTDL) \ $(top_builddir)/libmd5/libmd5.la \ - $(top_builddir)/libiberty/libiberty.a \ + $(top_builddir)/libiberty/pic/libiberty.a \ $(BOOST_FILESYSTEM_LIBS) libextatica_la_DEPENDENCIES = $(LTDLDEPS) -- 1.5.6.5