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