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