[sword-cvs] sword ltmain.sh,1.3,1.4 usrinst.sh,1.37,1.38

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword
In directory www:/tmp/cvs-serv8477

Modified Files:
	ltmain.sh usrinst.sh 
Log Message:


Index: ltmain.sh
===================================================================
RCS file: /usr/local/cvsroot/sword/ltmain.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ltmain.sh	24 Nov 2003 09:18:36 -0000	1.3
+++ ltmain.sh	5 Dec 2003 21:44:33 -0000	1.4
@@ -1,7 +1,7 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -58,8 +58,8 @@
 # Constants.
 PROGRAM=ltmain.sh
[...4148 lines suppressed...]
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script

Index: usrinst.sh
===================================================================
RCS file: /usr/local/cvsroot/sword/usrinst.sh,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- usrinst.sh	18 Nov 2003 20:54:16 -0000	1.37
+++ usrinst.sh	5 Dec 2003 21:44:33 -0000	1.38
@@ -7,7 +7,7 @@
 #OPTIONS="--with-vcl $OPTIONS"
 OPTIONS="--enable-debug $OPTIONS"
 #OPTIONS="--enable-profile $OPTIONS"
-#OPTIONS="--without-lucene $OPTIONS"
+OPTIONS="--without-lucene $OPTIONS"
 
 CPPFLAGS="$CFLAGS $CPPFLAGS -DUSBINARY" ./configure $OPTIONS $*