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