[PATCH] updated --enable-all-static patch (#881)

Here's a slightly updated patch (r3443) including --enable-all-static
option for subversion, initially purposed by Daniele Nicolodi, and
mentioned in issue 881. I've tested Daniele's patch, and also this
updated version, and both work fine.

* configure.in
  Included support for --enable-all-static option.

* Makefile.in
  Reverting order of $(LT_LDFLAGS) $(CC), to $(LT_LDFLAGS) $(CC),
  so that -all-static is received in the right place (perhaps LDFLAGS
  should be used instead?)

Index: ./configure.in
===================================================================
--- ./configure.in
+++ ./configure.in 2002-08-09 01:34:12.000000000 +0200
@@ -108,6 +108,17 @@
 echo "configuring libtool now"
 AC_PROG_LIBTOOL
 
+dnl Before configuring libtool check for --enable-all-static option
+AC_ARG_ENABLE(all-static,
+[ --enable-all-static build completely static (standalone) binaries],
+[
+ if test "$enableval" = "yes" ; then
+ LT_LDFLAGS="-all-static $LT_LDFLAGS"
+ fi
+])
+
+AC_SUBST(LT_LDFLAGS)
+
 NEON_WANTED_REGEX="`sed -n '/NEON_WANTED_REGEX=/s/.*=//p' $srcdir/build/buildcheck.sh`"
 dnl You can skip the neon version check only if you know what you are doing
 AC_ARG_ENABLE(neon-version-check,
Index: ./Makefile.in
===================================================================
--- ./Makefile.in
+++ ./Makefile.in 2002-08-09 02:26:20.000000000 +0200
@@ -44,7 +44,7 @@
 SHELL = @SHELL@
 LIBTOOL = $(SHELL) $(abs_builddir)/libtool
 LTFLAGS = --silent
-LT_LDFLAGS =
+LT_LDFLAGS = @LT_LDFLAGS@
 
 INCLUDES = @SVN_EXTRA_INCLUDES@ @SVN_NEON_INCLUDES@ \
                 @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@
@@ -73,8 +73,8 @@
 # special SWIG compilation
 COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c $<
 
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
-LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR)
+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
+LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR)
 
 INSTALL = @INSTALL@
 INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL)

-- 
Gustavo Niemeyer
[ 2AAC 7928 0FBF 0299 5EB5  60E2 2253 B29A 6664 3A0C ]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org