[Fedora-directory-commits] adminutil/m4 mozldap.m4,1.2,1.3

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminutil/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22616/adminutil/m4

Modified Files:
	mozldap.m4 
Log Message:
Resolves: bug 245208
Bug Description: adminutil: Solaris port for 1.1
Reviewed by: nkinder (Thanks!)
Fix Description: There are several problems with building/running adminutil on Solaris.  The biggest is that ICU introduces a dependency on C++.  Solaris requires linking with the C++ libraries and that also requires using C++ to link as well.  This means using the CXXLINK macro.  However, automake will only generate this macro if it detects a C++ source file in Makefile.am.  So, we have to introduce a dummy.cpp file to force automake to generate the CXXLINK macro, then use that to link the shared libraries.
Accept automake version 1.10 or later.
Look for mozldap6 first, then mozldap.
Platforms tested: Solaris 9 64bit
Flag Day: Yes - autotool file change
Doc impact: no



Index: mozldap.m4
===================================================================
RCS file: /cvs/dirsec/adminutil/m4/mozldap.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozldap.m4	4 Apr 2007 19:37:41 -0000	1.2
+++ mozldap.m4	21 Jun 2007 21:28:01 -0000	1.3
@@ -76,10 +76,10 @@
   AC_MSG_CHECKING(for mozldap with pkg-config)
   AC_PATH_PROG(PKG_CONFIG, pkg-config)
   if test -n "$PKG_CONFIG"; then
-    if $PKG_CONFIG --exists mozldap; then
-      ldapsdk_name=mozldap
-    elif $PKG_CONFIG --exists mozldap6; then
+    if $PKG_CONFIG --exists mozldap6; then
       ldapsdk_name=mozldap6
+    elif $PKG_CONFIG --exists mozldap; then
+      ldapsdk_name=mozldap
     else
       AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
     fi