up to 3.54

[packages/nss.git] / nss-config.in

diff --git a/nss-config.in b/nss-config.in
index b5799a3163528af2dbf180aa44ce31467faac5a5..e1196a81a18c1c46e5965ffe475134c136b5a00f 100644 (file)
--- a/nss-config.in
+++ b/nss-config.in
@@ -2,6 +2,10 @@
 
 prefix=@prefix@
 
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
 usage()
 {
        cat <<EOF
@@ -29,6 +33,7 @@ fi
 lib_ssl=yes
 lib_smime=yes
 lib_nss=yes
+lib_nssutil=yes
 
 while test $# -gt 0; do
   case "$1" in
@@ -62,7 +67,7 @@ while test $# -gt 0; do
       echo_libdir=yes
       ;;
     --version)
-      echo @VERSION@
+      echo ${major_version}.${minor_version}.${patch_version}
       ;;
     --cflags)
       echo_cflags=yes
@@ -79,6 +84,9 @@ while test $# -gt 0; do
     nss)
       lib_nss=yes
       ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -88,13 +96,13 @@ done
 
 # Set variables that may be dependent upon other variables
 if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
+    exec_prefix=@exec_prefix@
 fi
 if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
+    includedir=@includedir@
 fi
 if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
+    libdir=@libdir@
 fi
 
 if test "$echo_prefix" = "yes"; then
@@ -118,7 +126,6 @@ if test "$echo_cflags" = "yes"; then
 fi
 
 if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
       if test -n "$lib_ssl"; then
        libdirs="$libdirs -lssl${major_version}"
       fi
@@ -128,6 +135,9 @@ if test "$echo_libs" = "yes"; then
       if test -n "$lib_nss"; then
        libdirs="$libdirs -lnss${major_version}"
       fi
+      if test -n "$lib_nssutil"; then
+       libdirs="$libdirs -lnssutil${major_version}"
+      fi
       echo $libdirs
 fi