2004-03-17 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Wed, 17 Mar 2004 15:01:20 +0000 (15:01 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Wed, 17 Mar 2004 15:01:20 +0000 (15:01 +0000)
* libgcrypt-config.in (includedir, libdir): Quote'em.  Use
$gpg_error_cflags and $gpg_error_libs.  Fix construction of
$includes.

src/ChangeLog
src/libgcrypt-config.in

index ac1527d..2d493ed 100644 (file)
@@ -1,3 +1,9 @@
+2004-03-17  Marcus Brinkmann  <marcus@g10code.de>
+
+       * libgcrypt-config.in (includedir, libdir): Quote'em.  Use
+       $gpg_error_cflags and $gpg_error_libs.  Fix construction of
+       $includes.
+
 2004-03-14  Marcus Brinkmann  <marcus@g10code.de>
 
        * libgcrypt-config.in (includedir, libdir): New variables.  For
index f54dfb4..38f279a 100644 (file)
@@ -13,8 +13,8 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 version="@VERSION@"
-includedir=@includedir@
-libdir=@libdir@
+includedir="@includedir@"
+libdir="@libdir@"
 gpg_error_libs="@GPG_ERROR_LIBS@"
 gpg_error_cflags="@GPG_ERROR_CFLAGS@"
 
@@ -125,10 +125,10 @@ if test "$echo_cflags" = "yes"; then
 
     # Set up `includes'.
     if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
-       includes="$includes -I$includedir"
+       includes="-I$includedir"
     fi
     # Set up `cflags_final'.
-    cflags_final="$cflags_final @GPG_ERROR_CFLAGS@"
+    cflags_final="$cflags_final $gpg_error_cflags"
 
     echo "$includes $cflags_final"
 fi
@@ -139,11 +139,11 @@ if test "$echo_libs" = "yes"; then
 
     # Set up `libdirs'.
     if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
-       libdirs="$libdir -L@libdir@"
+       libdirs="-L$libdir"
     fi
 
     # Set up `libs_final'.
-    libs_final="$libs_final @GPG_ERROR_LIBS@"
+    libs_final="$libs_final $gpg_error_libs"
 
     echo "$libdirs $libs_final"
 fi