From 22b93084b7bbc50e5f13890551cfc1c0678a8e03 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 30 Aug 2004 21:36:53 +0000
Subject: [PATCH] Fix various order for various linking steps. Add Tcl libs.

---
 dict/Makefile.am       |    4 +-
 idzebra-config.in      |  103 ++++++++++++++++++++++++------------------------
 index/Makefile.am      |   10 ++---
 test/api/Makefile.am   |    8 ++--
 test/codec/Makefile.am |    8 ++--
 5 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/dict/Makefile.am b/dict/Makefile.am
index 105ad88..1cfa222 100644
--- a/dict/Makefile.am
+++ b/dict/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.7 2004-08-24 10:37:18 adam Exp $
+## $Id: Makefile.am,v 1.8 2004-08-30 21:36:53 adam Exp $
 
 lib_LTLIBRARIES = libidzebra-dict.la
 noinst_PROGRAMS = dicttest dictext
@@ -6,9 +6,9 @@ noinst_PROGRAMS = dicttest dictext
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC)
 
 LDADD = libidzebra-dict.la \
- ../util/libidzebra-util.la \
  ../bfile/libidzebra-bfile.la \
  ../dfa/libidzebra-dfa.la \
+ ../util/libidzebra-util.la \
   $(TCL_LIB) $(YAZLALIB)
 
 libidzebra_dict_la_SOURCES = scan.c dopen.c dclose.c drdwr.c open.c close.c insert.c \
diff --git a/idzebra-config.in b/idzebra-config.in
index 5c91ce6..e5b2964 100755
--- a/idzebra-config.in
+++ b/idzebra-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: idzebra-config.in,v 1.1 2004-08-29 12:31:32 adam Exp $
+# $Id: idzebra-config.in,v 1.2 2004-08-30 21:36:53 adam Exp $
 idzebraprefix=@prefix@
 idzebra_echo_cflags=no
 idzebra_echo_libs=no
@@ -10,13 +10,13 @@ idzebra_echo_lalibs=no
 idzebra_src_root=@IDZEBRA_SRC_ROOT@
 idzebra_build_root=@IDZEBRA_BUILD_ROOT@
 
-yazlibs="@YAZLIB@ @LIBS@"
-yazlalibs="@YAZLALIB@ @LIBS@"
+extralibs="@YAZLIB@ @TCL_LIB@ @LIBS@"
+extralalibs="@YAZLALIB@ @TCL_LIB@ @LIBS@"
 IDZEBRAVERSION=@VERSION@
 
 usage()
 {
-	cat <<EOF
+    cat <<EOF
 Usage: idzebra-config [OPTIONS] [LIBRARIES]
 Options:
 	[--prefix[=DIR]]
@@ -25,52 +25,52 @@ Options:
 	[--lalibs]
 	[--cflags]
 EOF
-	exit $1
+    exit $1
 }
 
 if test $# -eq 0; then
-	idzebra_echo_help=yes
+    idzebra_echo_help=yes
 fi
 
 modules=""
 while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      idzebraprefix=$optarg
-      ;;
-    --prefix)
-      echo $idzebraprefix
-      exit 0
-      ;;
-    --version)
-      echo $IDZEBRAVERSION
-      exit 0
-      ;;
-    --cflags)
-      idzebra_echo_cflags=yes
-      ;;
-    --libs)
-      idzebra_echo_libs=yes
-      ;;
-    --tabs)
-      idzebra_echo_tabs=yes
-      ;;
-    --lalibs)
-      idzebra_echo_lalibs=yes
-      ;;
-    -*)
-      idzebra_echo_help=yes
-      ;;
-    *)
-      modules="$modules $1"
-      ;;
-  esac
-  shift
+    case "$1" in
+	-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+	*) optarg= ;;
+    esac
+    
+    case $1 in
+	--prefix=*)
+	    idzebraprefix=$optarg
+	    ;;
+	--prefix)
+	    echo $idzebraprefix
+	    exit 0
+	    ;;
+	--version)
+	    echo $IDZEBRAVERSION
+	    exit 0
+	    ;;
+	--cflags)
+	    idzebra_echo_cflags=yes
+	    ;;
+	--libs)
+	    idzebra_echo_libs=yes
+	    ;;
+	--tabs)
+	    idzebra_echo_tabs=yes
+	    ;;
+	--lalibs)
+	    idzebra_echo_lalibs=yes
+	    ;;
+	-*)
+	    idzebra_echo_help=yes
+	    ;;
+	*)
+	    modules="$modules $1"
+	    ;;
+    esac
+    shift
 done
 
 IDZEBRALIB=""
@@ -78,8 +78,9 @@ IDZEBRALALIB=""
 IDZEBRAINC="@YAZINC@"
 
 if test -z "$modules"; then
-    modules="util bfile dfa dict isamc isamb isams data1 recctrl rset api"
+    modules="api rset recctrl dict isams isamc isamb data1 bfile dfa util"
 fi
+
 for m in $modules; do
     d=$m
     if test "$m" = "api"; then
@@ -94,27 +95,27 @@ for m in $modules; do
 done
 
 if test "$idzebra_echo_source" = "yes"; then
-    IDZEBRALIB="$IDZEBRALIB $yazlibs"
-    IDZEBRALALIB="$IDZEBRALALIB $yazlalibs"
+    IDZEBRALIB="$IDZEBRALIB $extralibs"
+    IDZEBRALALIB="$IDZEBRALALIB $extralalibs"
     IDZEBRAINC="$IDZEBRAINC -I${idzebra_src_root}/include"
 else
     if test "$idzebraprefix" != "/usr"; then
 	IDZEBRALIB="-L${idzebraprefix}/lib $IDZEBRALIB"
 	IDZEBRAINC="$IDZEBRAINC -I${idzebraprefix}/include"
     fi
-    IDZEBRALIB="$IDZEBRALIB $yazlibs"
+    IDZEBRALIB="$IDZEBRALIB $extralibs"
     IDZEBRALALIB="$IDZEBRALIB"
 fi
 
 if test "$idzebra_echo_help" = "yes"; then
-	usage 1 1>&2
+    usage 1 1>&2
 fi
 if test "$idzebra_echo_cflags" = "yes"; then
-	echo $IDZEBRAINC
+    echo $IDZEBRAINC
 fi
 if test "$idzebra_echo_libs" = "yes"; then
-	echo $IDZEBRALIB
+    echo $IDZEBRALIB
 fi
 if test "$idzebra_echo_lalibs" = "yes"; then
-	echo $IDZEBRALALIB
+    echo $IDZEBRALALIB
 fi
diff --git a/index/Makefile.am b/index/Makefile.am
index 2d5d3dd..3ee1193 100644
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.26 2004-08-24 10:37:18 adam Exp $
+## $Id: Makefile.am,v 1.27 2004-08-30 21:36:53 adam Exp $
 
 noinst_PROGRAMS = apitest kdump
 
@@ -14,17 +14,17 @@ libidzebra_api_la_SOURCES = dir.c dirs.c trav.c kinput.c kcompare.c \
 bin_PROGRAMS = zebraidx zebrasrv zebrash
 
 zebralibs = \
+ ../index/libidzebra-api.la \
  ../rset/libidzebra-rset.la \
+ ../recctrl/libidzebra-recctrl.la \
  ../dict/libidzebra-dict.la  \
  ../isams/libidzebra-isams.la \
  ../isamc/libidzebra-isamc.la \
  ../isamb/libidzebra-isamb.la \
- ../recctrl/libidzebra-recctrl.la \
  ../data1/libidzebra-data1.la \
  ../bfile/libidzebra-bfile.la \
  ../dfa/libidzebra-dfa.la \
- ../util/libidzebra-util.la \
- ../index/libidzebra-api.la
+ ../util/libidzebra-util.la
 
 zebraidx_SOURCES = main.c
 zebrasrv_SOURCES = zserver.c
@@ -35,7 +35,7 @@ kdump_SOURCES = kdump.c
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) \
   -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\"
 
-zebrash_LDADD= $(zebralibs) $(YAZLALIB) $(READLINE_LIBS) $(TCL_LIB)
+zebrash_LDADD= $(zebralibs) $(YAZLALIB) $(TCL_LIB) $(READLINE_LIBS)
 
 LDADD = $(zebralibs) $(YAZLALIB) $(TCL_LIB)
 
diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 136e300..e6b398b 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.14 2004-08-24 10:37:19 adam Exp $
+# $Id: Makefile.am,v 1.15 2004-08-30 21:36:53 adam Exp $
 
 noinst_PROGRAMS = testclient
 testclient_SOURCES = testclient.c
@@ -18,17 +18,17 @@ t6_SOURCES = t6.c
 AM_CPPFLAGS = -I$(top_srcdir)/include $(YAZINC)
 
 zebralibs = \
+ ../../index/libidzebra-api.la \
  ../../rset/libidzebra-rset.la \
+ ../../recctrl/libidzebra-recctrl.la \
  ../../dict/libidzebra-dict.la  \
  ../../isams/libidzebra-isams.la \
  ../../isamc/libidzebra-isamc.la \
  ../../isamb/libidzebra-isamb.la \
- ../../recctrl/libidzebra-recctrl.la \
  ../../data1/libidzebra-data1.la \
  ../../bfile/libidzebra-bfile.la \
  ../../dfa/libidzebra-dfa.la \
- ../../util/libidzebra-util.la \
- ../../index/libidzebra-api.la
+ ../../util/libidzebra-util.la
 
 LDADD = $(zebralibs) $(YAZLALIB) $(TCL_LIB)
 
diff --git a/test/codec/Makefile.am b/test/codec/Makefile.am
index 0349498..690a7bf 100644
--- a/test/codec/Makefile.am
+++ b/test/codec/Makefile.am
@@ -1,19 +1,19 @@
-# $Id: Makefile.am,v 1.2 2004-08-24 10:37:19 adam Exp $
+# $Id: Makefile.am,v 1.3 2004-08-30 21:36:53 adam Exp $
 
 TESTS = tstcodec
 
 zebralibs = \
+ ../../index/libidzebra-api.la \
  ../../rset/libidzebra-rset.la \
+ ../../recctrl/libidzebra-recctrl.la \
  ../../dict/libidzebra-dict.la  \
  ../../isams/libidzebra-isams.la \
  ../../isamc/libidzebra-isamc.la \
  ../../isamb/libidzebra-isamb.la \
- ../../recctrl/libidzebra-recctrl.la \
  ../../data1/libidzebra-data1.la \
  ../../bfile/libidzebra-bfile.la \
  ../../dfa/libidzebra-dfa.la \
- ../../util/libidzebra-util.la \
- ../../index/libidzebra-api.la
+ ../../util/libidzebra-util.la
 
 tstcodec_SOURCES = tstcodec.c
 
-- 
1.7.10.4