Update pcre-config for 16-bit library and correct type on libpcre16.pc.in.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@843 2f5784b3-3f2a-0410-8824-cb99058d5e15

1 files changed, 43 insertions, 5 deletions

diff --git a/pcre-config.in b/pcre-config.in
index fbdf612..f557f8c 100644
--- a/pcre-config.in
+++ b/pcre-config.in
@@ -4,12 +4,25 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 
+cflags="[--cflags]"
+
 if test @enable_cpp@ = yes ; then
-  usage="Usage: pcre-config [--prefix] [--exec-prefix] [--version] [--libs] [--libs-posix] [--libs-cpp] [--cflags] [--cflags-posix]"
+  libs="[--libs-cpp]"
 else
-  usage="Usage: pcre-config [--prefix] [--exec-prefix] [--version] [--libs] [--libs-posix] [--cflags] [--cflags-posix]"
+  libs=
+fi      
+
+if test @enable_pcre16@ = yes ; then
+  libs="[--libs16] $libs"
 fi
 
+if test @enable_pcre8@ = yes ; then
+  libs="[--libs] [--libs-posix] $libs"
+  cflags="$cflags [--cflags-posix]" 
+fi
+
+usage="Usage: pcre-config [--prefix] [--exec-prefix] [--version] $libs $cflags"
+
 if test $# -eq 0; then
       echo "${usage}" 1>&2
       exit 1
@@ -56,17 +69,42 @@ while test $# -gt 0; do
     --version)
       echo @PACKAGE_VERSION@
       ;;
-    --cflags | --cflags-posix)
+    --cflags)
       if test @includedir@ != /usr/include ; then
         includes=-I@includedir@
       fi
       echo $includes @PCRE_STATIC_CFLAG@
       ;;
+    --cflags-posix)
+      if test @enable_pcre8@ = yes ; then
+        if test @includedir@ != /usr/include ; then
+          includes=-I@includedir@
+        fi
+        echo $includes @PCRE_STATIC_CFLAG@
+      else
+        echo "${usage}" 1>&2
+      fi
+      ;;
     --libs-posix)
-      echo $libS$libR -lpcreposix -lpcre
+      if test @enable_pcre8@ = yes ; then
+        echo $libS$libR -lpcreposix -lpcre
+      else
+        echo "${usage}" 1>&2
+      fi
       ;;
     --libs)
-      echo $libS$libR -lpcre
+      if test @enable_pcre8@ = yes ; then
+        echo $libS$libR -lpcre
+      else
+        echo "${usage}" 1>&2
+      fi
+      ;;
+    --libs16)
+      if test @enable_pcre16@ = yes ; then
+        echo $libS$libR -lpcre16
+      else
+        echo "${usage}" 1>&2
+      fi
       ;;
     --libs-cpp)
       if test @enable_cpp@ = yes ; then