From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 27 Jun 2006 12:23:11 +0000 (+0000)
Subject: Configure build shared libraries by default.
X-Git-Tag: YAZ.2.1.26~55
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=0920106c1999d6628e21f42f2109dc1b18fbe58c;p=yaz-moved-to-github.git

Configure build shared libraries by default.
---

diff --git a/buildconf.sh b/buildconf.sh
index 4a15c42..acb37df 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.38 2006-05-26 15:09:03 adam Exp $
+# $Id: buildconf.sh,v 1.39 2006-06-27 12:23:11 adam Exp $
 
 automake=automake
 aclocal=aclocal
@@ -56,7 +56,7 @@ esac
 
 if $enable_configure; then
     if test -n "$sh_flags"; then
-	CFLAGS="$sh_flags" ./configure $*
+	CFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
     else
 	./configure $*
     fi
diff --git a/configure.ac b/configure.ac
index 2b9cc87..684b43a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.26 2006-06-16 10:19:23 adam Exp $
+dnl $Id: configure.ac,v 1.27 2006-06-27 12:23:11 adam Exp $
 AC_PREREQ(2.59)
 AC_INIT([yaz],[2.1.23],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
@@ -16,7 +16,6 @@ AC_CHECK_PROGS(YACC, 'bison -y')
 test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
 AC_CHECK_PROGS(TCLSH, tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2, tclsh)
 AC_PROG_INSTALL
-AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
 dnl
diff --git a/doc/installation.xml b/doc/installation.xml
index e07f1c9..6f0769a 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -1,4 +1,4 @@
-<!-- $Id: installation.xml,v 1.31 2006-05-03 13:38:12 adam Exp $ -->
+<!-- $Id: installation.xml,v 1.32 2006-06-27 12:23:12 adam Exp $ -->
  <chapter id="installation"><title>Compilation and Installation</title>
   
   <sect1><title>Introduction</title>
@@ -180,11 +180,11 @@
         </para></listitem>
       </varlistentry>
 
-      <varlistentry><term><literal>--enable-shared</literal></term>
-       <listitem><para>The make process will create shared
+      <varlistentry><term><literal>--disable-shared</literal></term>
+       <listitem><para>The make process will not create shared
          libraries (also known as shared objects <filename>.so</filename>).
-         By default, no shared libraries are created -
-         equivalent to <literal>--disable-shared</literal>.
+         By default, shared libraries are created -
+         equivalent to <literal>--enable-shared</literal>.
         </para></listitem>
       </varlistentry>