yazpp-config: quote some RHS values (that might include blanks)

[yazpp-moved-to-github.git] / yazpp-config.in

diff --git a/yazpp-config.in b/yazpp-config.in
index 61a532c..d66d4c1 100644 (file)
--- a/yazpp-config.in
+++ b/yazpp-config.in
@@ -1,8 +1,8 @@
 #!/bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+libdir="@libdir@"
+includedir="@includedir@"
 echo_cflags=no
 echo_libs=no
 echo_help=no
@@ -10,8 +10,8 @@ echo_tabs=no
 echo_source=yes
 echo_lalibs=no
 echo_zoom=no
-src_root=@abs_top_srcdir@
-build_root=@abs_top_builddir@
+src_root="@abs_top_srcdir@"
+build_root="@abs_top_builddir@"
 yazlibs="@YAZLIB@ @LIBS@"
 yazlalibs="@YAZLALIB@ @LIBS@"
 VERSION=@VERSION@
@@ -78,8 +78,13 @@ YAZPPLALIB="$yazlalibs"
 YAZPPLIB="$yazlibs"
 
 if test "$echo_source" = "yes"; then
-    YAZPPLIB="-L${build_root}/src/.libs -lyazpp $YAZPPLIB"
-    YAZPPLALIB="${build_root}/src/libyazpp.la $YAZPPLALIB"
+    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 "$echo_zoom" = "yes"; then
@@ -92,7 +97,7 @@ else
     else
        YAZPPLIB="-L${libdir} ${libs_short} $YAZPPLIB"
     fi
-    YAZPPLALIB=$YAZPPLIB
+    YAZPPLALIB="$YAZPPLIB"
     if test "$prefix" != "/usr"; then
        YAZPPINC="$YAZPPINC -I${includedir}"
     fi