f33542
--- neon-0.27.0/neon-config.in.multilib
f33542
+++ neon-0.27.0/neon-config.in
f33542
@@ -5,7 +5,11 @@
f33542
 prefix=@prefix@
f33542
 exec_prefix=@exec_prefix@
f33542
 includedir=@includedir@
f33542
-libdir=@libdir@
f33542
+
f33542
+libdir=`pkg-config --variable=libdir neon`
f33542
+CFLAGS=`pkg-config --cflags neon`
f33542
+LIBS=`pkg-config --libs neon`
f33542
+has_lfs=`pkg-config --variable=has_lfs neon`
f33542
 
f33542
 usage()
f33542
 {
f33542
@@ -23,7 +27,7 @@
f33542
   --support FEATURE     exit with success if feature is supported
f33542
 
f33542
  Known features: 
f33542
-    dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@],
f33542
+    dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}],
f33542
     i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@]
f33542
 
f33542
 EOF
f33542
@@ -69,11 +73,10 @@
f33542
 	;;
f33542
 
f33542
     --cflags)
f33542
-       	echo -I${includedir}/neon @NEON_CFLAGS@
f33542
+       	echo ${CFLAGS}
f33542
        	;;
f33542
 
f33542
     --libs)
f33542
-        LIBS="-lneon @NEON_LIBS@"
f33542
 	# Don't add standard library paths
f33542
         if test "$prefix" != "/usr"; then
f33542
            LIBS="-L${libdir} ${LIBS}"
f33542
@@ -93,7 +96,7 @@
f33542
 	zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
f33542
 	ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
f33542
 	dav|DAV) support @NE_FLAG_DAV@ ;;
f33542
-	lfs|LFS) support @NE_FLAG_LFS@ ;;
f33542
+	lfs|LFS) support ${has_lfs} ;;
f33542
 	i18n|I18N) support @NE_FLAG_I18N@ ;;
f33542
 	ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;;
f33542
 	*) support no ;;
f33542
--- neon-0.27.0/neon.pc.in.multilib
f33542
+++ neon-0.27.0/neon.pc.in
f33542
@@ -2,6 +2,7 @@
f33542
 exec_prefix=@exec_prefix@
f33542
 libdir=@libdir@
f33542
 includedir=@includedir@
f33542
+has_lfs=@NE_FLAG_LFS@
f33542
 
f33542
 Name: neon
f33542
 Description: HTTP/WebDAV client library