summaryrefslogtreecommitdiffstats
path: root/m4/nss.m4
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2007-02-06 15:51:22 +0000
committerRich Megginson <rmeggins@redhat.com>2007-02-06 15:51:22 +0000
commit27a8e752935491cb6c259f7bb15efb23d592ff8b (patch)
treeabb00d1cc95ec735431d53e5a18e858b9e371322 /m4/nss.m4
parent12dd2b111c0188fd1e2aebb5fbca11ba11ab76ef (diff)
downloadds-27a8e752935491cb6c259f7bb15efb23d592ff8b.tar.gz
ds-27a8e752935491cb6c259f7bb15efb23d592ff8b.tar.xz
ds-27a8e752935491cb6c259f7bb15efb23d592ff8b.zip
Resolves: bug 227452
Bug Description: Solaris build: Need to add other libs for autotool build Reviewed by: nhosoi (Thanks!) Fix Description: The AC_CHECK_LIB test for db_create needs -lnsl because libdb links with it on Solaris. Other executables require -lnsl, -lsocket, and -ldl. The strategy is to put these in the platform specific section in configure.ac so they can be exported to the Makefile. Then we can just use the macros directly in Makefile. On platforms where these are not required, they will evaluate to empty. There was a bug in the regexp that derived the libdir from pkg-config in several m4 files. We needed to use .* instead of just *. pkg-config --libs-only-L returns multiple paths on Solaris but not on linux. Platforms tested: Solaris 9 Flag Day: no Doc impact: no
Diffstat (limited to 'm4/nss.m4')
-rw-r--r--m4/nss.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/nss.m4 b/m4/nss.m4
index 1f11957a..9d892254 100644
--- a/m4/nss.m4
+++ b/m4/nss.m4
@@ -79,12 +79,12 @@ if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then
if $PKG_CONFIG --exists nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
- nss_libdir=`$PKG_CONFIG --libs-only-L nss | sed -e s/-L// | sed -e s/\ *$//`
+ nss_libdir=`$PKG_CONFIG --libs-only-L nss | sed -e s/-L// | sed -e s/\ .*$//`
AC_MSG_RESULT([using system NSS])
elif $PKG_CONFIG --exists dirsec-nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss`
nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss`
- nss_libdir=`$PKG_CONFIG --libs-only-L dirsec-nss | sed -e s/-L// | sed -e s/\ *$//`
+ nss_libdir=`$PKG_CONFIG --libs-only-L dirsec-nss | sed -e s/-L// | sed -e s/\ .*$//`
AC_MSG_RESULT([using system dirsec NSS])
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])