e0b1e0
--- neon-0.25.5/neon.pc.in.multilib
e0b1e0
+++ neon-0.25.5/neon.pc.in
e0b1e0
@@ -2,6 +2,7 @@
e0b1e0
 exec_prefix=@exec_prefix@
e0b1e0
 libdir=@libdir@
e0b1e0
 includedir=@includedir@
e0b1e0
+has_lfs=@NE_FLAG_LFS@
e0b1e0
 
e0b1e0
 Name: neon
e0b1e0
 Description: HTTP/WebDAV client library
e0b1e0
--- neon-0.25.5/neon-config.in.multilib
e0b1e0
+++ neon-0.25.5/neon-config.in
e0b1e0
@@ -5,7 +5,11 @@
e0b1e0
 prefix=@prefix@
e0b1e0
 exec_prefix=@exec_prefix@
e0b1e0
 includedir=@includedir@
e0b1e0
-libdir=@libdir@
e0b1e0
+
e0b1e0
+libdir=`pkg-config --variable=libdir neon`
e0b1e0
+CFLAGS=`pkg-config --cflags neon`
e0b1e0
+LIBS=`pkg-config --libs neon`
e0b1e0
+has_lfs=`pkg-config --variable=has_lfs neon`
e0b1e0
 
e0b1e0
 usage()
e0b1e0
 {
e0b1e0
@@ -21,7 +25,7 @@
e0b1e0
   --help		display this help and exit
e0b1e0
   --version		output version information
e0b1e0
   --support FEATURE     exit with success if feature is supported
e0b1e0
- Known features: dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@]
e0b1e0
+ Known features: dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}]
e0b1e0
 
e0b1e0
 EOF
e0b1e0
 
e0b1e0
@@ -66,11 +70,10 @@
e0b1e0
 	;;
e0b1e0
 
e0b1e0
     --cflags)
e0b1e0
-       	echo -I${includedir}/neon @NEON_CFLAGS@
e0b1e0
+       	echo ${CFLAGS}
e0b1e0
        	;;
e0b1e0
 
e0b1e0
     --libs)
e0b1e0
-        LIBS="-lneon @NEON_LIBS@"
e0b1e0
 	# Don't add standard library paths
e0b1e0
         if test "$prefix" != "/usr"; then
e0b1e0
            LIBS="-L${libdir} ${LIBS}"
e0b1e0
@@ -90,7 +93,7 @@
e0b1e0
 	zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
e0b1e0
 	ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
e0b1e0
 	dav|DAV) support @NE_FLAG_DAV@ ;;
e0b1e0
-	lfs|LFS) support @NE_FLAG_LFS@ ;;
e0b1e0
+	lfs|LFS) support ${has_lfs} ;;
e0b1e0
 	*) support no ;;
e0b1e0
 	esac
e0b1e0
 	;;