X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=yazpp-config.in;h=d66d4c121659cd89516d07bd8cc5a1693214bb2a;hp=a76b6ec67829c70b80e1b7ea92a285f6a48249dd;hb=64579d7f330f966ed5dbd3af26f50507f0b86530;hpb=4b3585940162cf9ca65ca4a6914c0addcde50eef

diff --git a/yazpp-config.in b/yazpp-config.in
index a76b6ec..d66d4c1 100644
--- a/yazpp-config.in
+++ b/yazpp-config.in
@@ -1,22 +1,25 @@
 #!/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@"
+exec_prefix="@exec_prefix@"
+libdir="@libdir@"
+includedir="@includedir@"
+echo_cflags=no
+echo_libs=no
+echo_help=no
+echo_tabs=no
+echo_source=yes
+echo_lalibs=no
+echo_zoom=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,78 +31,92 @@ EOF
 }
 
 if test $# -eq 0; then
-	yaz_echo_help=yes
+    echo_help=yes
 fi
 
 while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      yazppprefix=$optarg
-      ;;
-    --prefix)
-      echo $yazppprefix
-      exit 0
-      ;;
-    --version)
-      echo $YAZPPVERSION
-      exit 0
-      ;;
-    --cflags)
-      yaz_echo_cflags=yes
-      ;;
-    --libs)
-      yaz_echo_libs=yes
-      ;;
-    --tabs)
-      yaz_echo_tabs=yes
-      ;;
-    --lalibs)
-      yaz_echo_lalibs=yes
-      ;;
-    -*)
-      yaz_echo_help=yes
-      ;;
-  esac
-  shift
+    case "$1" in
+	-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+	*) optarg= ;;
+    esac
+    case $1 in
+	--prefix=*)
+	prefix=$optarg
+	;;
+	--prefix)
+	    echo $prefix
+	    exit 0
+	    ;;
+	--version)
+	    echo $VERSION
+	    exit 0
+	    ;;
+	--cflags)
+	    echo_cflags=yes
+	    ;;
+	--libs)
+	    echo_libs=yes
+	    ;;
+	--tabs)
+	    echo_tabs=yes
+	    ;;
+	--lalibs)
+	    echo_lalibs=yes
+	    ;;
+	zoom)
+	    echo_zoom=yes
+	    ;;
+	-*)
+	    echo_help=yes
+	    ;;
+    esac
+    shift
 done
 
-libs_short="-lyazpp -lzoompp"
-
 YAZPPINC="@YAZINC@"
+YAZPPLALIB="$yazlalibs"
+YAZPPLIB="$yazlibs"
 
-if test "$yaz_echo_source" = "yes"; then
-    YAZPPLIB="-L${yazpp_build_root}/src/.libs -lyazpp"
-    YAZPPLIB="$YAZPPLIB -L${yazpp_build_root}/zoom/.libs -lzoompp"
-    YAZPPLIB="$YAZPPLIB $yazlibs"
-    YAZPPLALIB="${yazpp_build_root}/src/libyazpp.la $yazlalibs"
-    YAZPPINC="-I${yazpp_src_root}/include $YAZPPINC"
+if test "$echo_source" = "yes"; then
+    if test "$echo_zoom" = "yes"; then
+        YAZPPLIB="-L${build_root}/zoom/.libs -lzoomzpp $YAZPPLIB"
+        YAZPPLALIB="${build_root}/zoom/libzoompp.la $YAZPPLALIB"
+    else
+        YAZPPLIB="-L${build_root}/src/.libs -lyazpp $YAZPPLIB"
+        YAZPPLALIB="${build_root}/src/libyazpp.la $YAZPPLALIB"
+    fi
+    YAZPPINC="$YAZPPINC -I${src_root}/include"
 else
-
-    if test "$yazppprefix" = "/usr"; then
-	YAZPPLIB="${libs_short} $yazlibs"
+    if test "$echo_zoom" = "yes"; then
+	libs_short="-lzoompp"
+    else
+	libs_short="-lyazpp"
+    fi
+    if test "$prefix" = "/usr"; then
+	YAZPPLIB="${libs_short} $YAZPPLIB"
     else
-	YAZPPLIB="-L${yazppprefix}/lib ${libs_short} $yazlibs"
+	YAZPPLIB="-L${libdir} ${libs_short} $YAZPPLIB"
     fi
-    YAZPPLALIB=$YAZPPLIB
-    if test "$yazppprefix" != "/usr"; then
-	YAZPPINC="-I${yazppprefix}/include $YAZPPINC"
+    YAZPPLALIB="$YAZPPLIB"
+    if test "$prefix" != "/usr"; then
+	YAZPPINC="$YAZPPINC -I${includedir}"
     fi
 fi
 
-if test "$yaz_echo_help" = "yes"; then
-	usage 1 1>&2
+if test "$echo_help" = "yes"; then
+    usage 1 1>&2
 fi
-if test "$yaz_echo_cflags" = "yes"; then
-	echo $YAZPPINC
+if test "$echo_cflags" = "yes"; then
+    echo $YAZPPINC
 fi
-if test "$yaz_echo_libs" = "yes"; then
-	echo $YAZPPLIB
+if test "$echo_libs" = "yes"; then
+    echo $YAZPPLIB
 fi
-if test "$yaz_echo_lalibs" = "yes"; then
-	echo $YAZPPLALIB
+if test "$echo_lalibs" = "yes"; then
+    echo $YAZPPLALIB
 fi
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 4
+# End: