From d186092a74d767a2e1be5e9db685b41ce8f76936 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 15 Sep 2010 10:52:41 +0200
Subject: [PATCH] Simplify yazpp-config a bit

src_root, build_root values can be taken from automake value.
---
 configure.ac    |    5 -----
 yazpp-config.in |   67 +++++++++++++++++++++++++++----------------------------
 2 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3255fad..43bb3f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,11 +22,6 @@ AC_CHECK_HEADERS([unistd.h sys/stat.h sys/time.h sys/types.h fcntl.h])
 AC_ARG_ENABLE(zoom,[  --disable-zoom          disable ZOOM (for old C++ compilers)],[enable_zoom=$enableval],[enable_zoom=yes])
 AM_CONDITIONAL(ZOOM, test $enable_zoom = "yes")
 
-AC_SUBST(YAZPP_SRC_ROOT)
-AC_SUBST(YAZPP_BUILD_ROOT)
-YAZPP_SRC_ROOT=`cd ${srcdir}; pwd`
-YAZPP_BUILD_ROOT=`pwd`
-
 AC_OUTPUT([
 	Doxyfile
 	Makefile
diff --git a/yazpp-config.in b/yazpp-config.in
index a76b6ec..4379120 100644
--- a/yazpp-config.in
+++ b/yazpp-config.in
@@ -1,22 +1,21 @@
 #!/bin/sh
-yazppprefix=@prefix@
-yaz_echo_cflags=no
-yaz_echo_libs=no
-yaz_echo_help=no
-yaz_echo_tabs=no
-yaz_echo_source=yes
-yaz_echo_lalibs=no
-yazpp_src_root=@YAZPP_SRC_ROOT@
-yazpp_build_root=@YAZPP_BUILD_ROOT@
-
+prefix=@prefix@
+echo_cflags=no
+echo_libs=no
+echo_help=no
+echo_tabs=no
+echo_source=yes
+echo_lalibs=no
+src_root=@abs_top_srcdir@
+build_root=@abs_top_builddir@
 yazlibs="@YAZLIB@ @LIBS@"
 yazlalibs="@YAZLALIB@ @LIBS@"
-YAZPPVERSION=@VERSION@
+VERSION=@VERSION@
 
 usage()
 {
 	cat <<EOF
-Usage: yaz++-config [OPTIONS] [LIBRARIES]
+Usage: yazpp-config [OPTIONS] [LIBRARIES]
 Options:
 	[--prefix[=DIR]]
 	[--version]
@@ -28,7 +27,7 @@ EOF
 }
 
 if test $# -eq 0; then
-	yaz_echo_help=yes
+	echo_help=yes
 fi
 
 while test $# -gt 0; do
@@ -39,30 +38,30 @@ while test $# -gt 0; do
 
   case $1 in
     --prefix=*)
-      yazppprefix=$optarg
+      prefix=$optarg
       ;;
     --prefix)
-      echo $yazppprefix
+      echo $prefix
       exit 0
       ;;
     --version)
-      echo $YAZPPVERSION
+      echo $VERSION
       exit 0
       ;;
     --cflags)
-      yaz_echo_cflags=yes
+      echo_cflags=yes
       ;;
     --libs)
-      yaz_echo_libs=yes
+      echo_libs=yes
       ;;
     --tabs)
-      yaz_echo_tabs=yes
+      echo_tabs=yes
       ;;
     --lalibs)
-      yaz_echo_lalibs=yes
+      echo_lalibs=yes
       ;;
     -*)
-      yaz_echo_help=yes
+      echo_help=yes
       ;;
   esac
   shift
@@ -72,34 +71,34 @@ libs_short="-lyazpp -lzoompp"
 
 YAZPPINC="@YAZINC@"
 
-if test "$yaz_echo_source" = "yes"; then
-    YAZPPLIB="-L${yazpp_build_root}/src/.libs -lyazpp"
-    YAZPPLIB="$YAZPPLIB -L${yazpp_build_root}/zoom/.libs -lzoompp"
+if test "$echo_source" = "yes"; then
+    YAZPPLIB="-L${build_root}/src/.libs -lyazpp"
+    YAZPPLIB="$YAZPPLIB -L${build_root}/zoom/.libs -lzoompp"
     YAZPPLIB="$YAZPPLIB $yazlibs"
-    YAZPPLALIB="${yazpp_build_root}/src/libyazpp.la $yazlalibs"
-    YAZPPINC="-I${yazpp_src_root}/include $YAZPPINC"
+    YAZPPLALIB="${build_root}/src/libyazpp.la $yazlalibs"
+    YAZPPINC="-I${src_root}/include $YAZPPINC"
 else
 
-    if test "$yazppprefix" = "/usr"; then
+    if test "$prefix" = "/usr"; then
 	YAZPPLIB="${libs_short} $yazlibs"
     else
-	YAZPPLIB="-L${yazppprefix}/lib ${libs_short} $yazlibs"
+	YAZPPLIB="-L${prefix}/lib ${libs_short} $yazlibs"
     fi
     YAZPPLALIB=$YAZPPLIB
-    if test "$yazppprefix" != "/usr"; then
-	YAZPPINC="-I${yazppprefix}/include $YAZPPINC"
+    if test "$prefix" != "/usr"; then
+	YAZPPINC="-I${prefix}/include $YAZPPINC"
     fi
 fi
 
-if test "$yaz_echo_help" = "yes"; then
+if test "$echo_help" = "yes"; then
 	usage 1 1>&2
 fi
-if test "$yaz_echo_cflags" = "yes"; then
+if test "$echo_cflags" = "yes"; then
 	echo $YAZPPINC
 fi
-if test "$yaz_echo_libs" = "yes"; then
+if test "$echo_libs" = "yes"; then
 	echo $YAZPPLIB
 fi
-if test "$yaz_echo_lalibs" = "yes"; then
+if test "$echo_lalibs" = "yes"; then
 	echo $YAZPPLALIB
 fi
-- 
1.7.10.4