diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2007-02-02 20:27:30 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2007-02-02 20:27:30 +0000 |
| commit | 2497e27ae1f819e327f2ddf75c6778dd01d13437 (patch) | |
| tree | 13e71f93a102155b10ab11da7ab1fa5efad8632e /m4 | |
| parent | 112105119ba15815c4868b4c690820b0999650bf (diff) | |
| download | ds-2497e27ae1f819e327f2ddf75c6778dd01d13437.tar.gz ds-2497e27ae1f819e327f2ddf75c6778dd01d13437.tar.xz ds-2497e27ae1f819e327f2ddf75c6778dd01d13437.zip | |
fix build problems on Solaris; minor m4 cleanup
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/mozldap.m4 | 5 | ||||
| -rw-r--r-- | m4/nspr.m4 | 4 | ||||
| -rw-r--r-- | m4/nss.m4 | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/m4/mozldap.m4 b/m4/mozldap.m4 index fcd8b241..6a65b176 100644 --- a/m4/mozldap.m4 +++ b/m4/mozldap.m4 @@ -1,5 +1,5 @@ # BEGIN COPYRIGHT BLOCK -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or @@ -31,6 +31,7 @@ AC_ARG_WITH(ldapsdk, [ --with-ldapsdk=PATH Mozilla LDAP SDK directory], ldapsdk_inc="-I$LDAPSDKDIR/include" ldapsdk_lib="-L$LDAPSDKDIR/lib" ldapsdk_libdir="$LDAPSDKDIR/lib" + ldapsdk_bindir="$LDAPSDKDIR/bin" else echo AC_MSG_ERROR([$withval not found]) @@ -73,8 +74,8 @@ AC_MSG_RESULT(no)) # last resort if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$ldapsdk_bindir"; then - AC_MSG_CHECKING(for mozldap with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) + AC_MSG_CHECKING(for mozldap with pkg-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists mozldap6; then mozldappkg=mozldap6 @@ -1,5 +1,5 @@ # BEGIN COPYRIGHT BLOCK -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or @@ -73,8 +73,8 @@ AC_MSG_RESULT(no)) # last resort if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then - AC_MSG_CHECKING(for nspr with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) + AC_MSG_CHECKING(for nspr with pkg-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists nspr; then nspr_inc=`$PKG_CONFIG --cflags-only-I nspr` @@ -1,5 +1,5 @@ # BEGIN COPYRIGHT BLOCK -# Copyright (C) 2006 Red Hat, Inc. +# Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or @@ -73,8 +73,8 @@ AC_MSG_RESULT(no)) # last resort if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then - AC_MSG_CHECKING(for nss with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) + AC_MSG_CHECKING(for nss with pkg-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists nss; then nss_inc=`$PKG_CONFIG --cflags-only-I nss` |