From 876883e86ca647ef6481c47459e6372a13ea65c4 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 29 Jun 2006 14:10:33 +0000 Subject: [PATCH] Fix echo_source for idzebra-config. Update it to use /usr/lib libs again --- configure.ac | 4 ++-- idzebra-config.in | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 45ab75e..e0d6789 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Zebra, Index Data ApS, 1995-2006 -dnl $Id: configure.ac,v 1.20 2006-06-28 13:26:13 adam Exp $ +dnl $Id: configure.ac,v 1.21 2006-06-29 14:10:33 adam Exp $ dnl AC_PREREQ(2.59) AC_INIT([idzebra],[2.0.0],[adam@indexdata.dk]) @@ -375,7 +375,7 @@ AC_OUTPUT([ idzebra.spec idzebra-config Doxyfile -],[sed s%idzebra_echo_source=yes%idzebra_echo_source=no%g < idzebra-config > util/idzebra-config && chmod +x idzebra-config util/idzebra-config]) +],[sed s%echo_source=yes%echo_source=no%g < idzebra-config > util/idzebra-config && chmod +x idzebra-config util/idzebra-config]) echo \ "------------------------------------------------------------------------ diff --git a/idzebra-config.in b/idzebra-config.in index 956fbbb..46c892c 100755 --- a/idzebra-config.in +++ b/idzebra-config.in @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: idzebra-config.in,v 1.10 2006-06-29 09:10:28 adam Exp $ +# $Id: idzebra-config.in,v 1.11 2006-06-29 14:10:33 adam Exp $ version=@VERSION@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -111,7 +111,10 @@ if test "$echo_source" = "yes"; then IDZEBRATAB="${idzebra_src_root}/tab" IDZEBRAMOD="${idzebra_src_root}/recctrl" else - IDZEBRALIB="-L${libdir}/idzebra${package_suffix} $IDZEBRALIB $extralibs" + if test "$libdir" != "/usr/lib"; then + IDZEBRALIB="-L${libdir} $IDZEBRALIB" + fi + IDZEBRALIB="$IDZEBRALIB $extralibs" IDZEBRALALIB="$IDZEBRALIB" IDZEBRAINC="$IDZEBRAINC -I${prefix}/include/idzebra${package_suffix}" IDZEBRATAB="@datarootdir@/idzebra${package_suffix}/tab" -- 1.7.10.4