[Fedora-directory-commits] dsgw/m4 sasl.m4, NONE, 1.1 fhs.m4, NONE, 1.1 adminutil.m4, 1.1.1.1, 1.2 icu.m4, 1.1.1.1, 1.2 mozldap.m4, 1.1.1.1, 1.2 nspr.m4, 1.1.1.1, 1.2 nss.m4, 1.1.1.1, 1.2 httpd.m4, 1.2, NONE

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Thu Jan 10 01:19:39 UTC 2008


Author: rmeggins

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

Modified Files:
	adminutil.m4 icu.m4 mozldap.m4 nspr.m4 nss.m4 
Added Files:
	sasl.m4 fhs.m4 
Removed Files:
	httpd.m4 
Log Message:
update of autotool files based on recent ldapserver and adminserver


--- NEW FILE sasl.m4 ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
#
# END COPYRIGHT BLOCK
# -*- tab-width: 4; -*-
# Configure paths for SASL

dnl ========================================================
dnl = sasl is used to support various authentication mechanisms
dnl = such as DIGEST-MD5 and GSSAPI.
dnl ========================================================
dnl ========================================================
dnl = Use the sasl libraries on the system (assuming it exists)
dnl ========================================================
AC_CHECKING(for sasl)

AC_MSG_CHECKING(for --with-sasl)
AC_ARG_WITH(sasl,
    [[  --with-sasl=PATH   Use sasl from supplied path]],
    dnl = Look in the standard system locations
    [
      if test "$withval" = "yes"; then
        AC_MSG_RESULT(yes)

        dnl = Check for sasl.h in the normal locations
        if test -f /usr/include/sasl/sasl.h; then
          sasl_inc="-I/usr/include/sasl"
        elif test -f /usr/include/sasl.h; then
          sasl_inc="-I/usr/include"
        else
          AC_MSG_ERROR(sasl.h not found)
        fi

      dnl = Check the user provided location
      elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then
        AC_MSG_RESULT([using $withval])

        if test -f "$withval/include/sasl/sasl.h"; then
          sasl_inc="-I$withval/include/sasl"
        elif test -f "$withval/include/sasl.h"; then
          sasl_inc="-I$withval/include"
        else
          AC_MSG_ERROR(sasl.h not found)
        fi

        sasl_lib="-L$withval/lib"
        sasl_libdir="$withval/lib"
      else
          AC_MSG_RESULT(yes)
          AC_MSG_ERROR([sasl not found in $withval])
      fi
    ],
    AC_MSG_RESULT(no))

AC_MSG_CHECKING(for --with-sasl-inc)
AC_ARG_WITH(sasl-inc,
    [[  --with-sasl-inc=PATH   SASL include file directory]],
    [
      if test -f "$withval"/sasl.h; then
        AC_MSG_RESULT([using $withval])
        sasl_inc="-I$withval"
      else
        echo
        AC_MSG_ERROR([$withval/sasl.h not found])
      fi
    ],
    AC_MSG_RESULT(no))

AC_MSG_CHECKING(for --with-sasl-lib)
AC_ARG_WITH(sasl-lib,
    [[  --with-sasl-lib=PATH   SASL library directory]],
    [
      if test -d "$withval"; then
        AC_MSG_RESULT([using $withval])
        sasl_lib="-L$withval"
        sasl_libdir="$withval"
      else
        echo
        AC_MSG_ERROR([$withval not found])
      fi
    ],
    AC_MSG_RESULT(no))

if test -z "$sasl_inc"; then
  AC_MSG_CHECKING(for sasl.h)
  dnl - Check for sasl in standard system locations
  if test -f /usr/include/sasl/sasl.h; then
    AC_MSG_RESULT([using /usr/include/sasl/sasl.h])
    sasl_inc="-I/usr/include/sasl"
  elif test -f /usr/include/sasl.h; then
    AC_MSG_RESULT([using /usr/include/sasl.h])
    sasl_inc="-I/usr/include"
  else
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([sasl not found, specify with --with-sasl.])
  fi
fi


--- NEW FILE fhs.m4 ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
#
# END COPYRIGHT BLOCK

AC_CHECKING(for FHS)

# check for --with-fhs
AC_MSG_CHECKING(for --with-fhs)
AC_ARG_WITH(fhs, [  --with-fhs   Use FHS layout],
[
  with_fhs=yes
  AC_MSG_RESULT(yes)
],
AC_MSG_RESULT(no))

if test "$with_fhs" = "yes"; then
  AC_DEFINE([IS_FHS], [1], [Use FHS layout])
fi

# check for --with-fhs-opt
AC_MSG_CHECKING(for --with-fhs-opt)
AC_ARG_WITH(fhs-opt, [  --with-fhs-opt   Use FHS optional layout],
[
  with_fhs_opt=yes
  AC_MSG_RESULT(yes)
],
AC_MSG_RESULT(no))

if test "$with_fhs_opt" = "yes"; then
  AC_DEFINE([IS_FHS_OPT], [1], [Use FHS optional layout])
fi

if test "$with_fhs" = "yes" -a "$with_fhs_opt" = "yes"; then
  AC_MSG_ERROR([Can't set both --with-fhs and --with-fhs-opt.  Please only use one of these options.])
fi


Index: adminutil.m4
===================================================================
RCS file: /cvs/dirsec/dsgw/m4/adminutil.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- adminutil.m4	1 Jun 2006 19:43:50 -0000	1.1.1.1
+++ adminutil.m4	10 Jan 2008 01:19:36 -0000	1.2
@@ -29,15 +29,8 @@
     AC_MSG_RESULT([using $withval])
     ADMINUTILDIR=$withval
     adminutil_lib="-L$ADMINUTILDIR/lib"
-    # check for version - only needed for older adminutil versions
-    for file in $ADMINUTILDIR/lib/* ; do
-      echo $file | grep 'libadminutil[[0-9][0-9]]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\([[0-9][0-9]]\).*/\1/'` ; break
-    done
-    # use the latest one
-    adminutil_incdir=`ls -1d $ADMINUTILDIR/include/adminutil-* | sort -n | tail -1`
-    if ! test -n "$adminutil_incdir" -a -d "$adminutil_incdir" ; then
-      adminutil_incdir=$ADMINUTILDIR/include
-    fi
+    adminutil_libdir="$ADMINUTILDIR/lib"
+    adminutil_incdir=$ADMINUTILDIR/include
     if ! test -e "$adminutil_incdir/libadminutil/admutil.h" ; then
       AC_MSG_ERROR([$withval include dir not found])
     fi
@@ -59,6 +52,7 @@
     if $PKG_CONFIG --exists adminutil; then
       adminutil_inc=`$PKG_CONFIG --cflags-only-I adminutil`
       adminutil_lib=`$PKG_CONFIG --libs-only-L adminutil`
+      adminutil_libdir=`$PKG_CONFIG --libs-only-L adminutil | sed -e s/-L// | sed -e s/\ .*$//`
     else
       AC_MSG_ERROR([ADMINUTIL not found, specify with --with-adminutil.])
     fi


Index: icu.m4
===================================================================
RCS file: /cvs/dirsec/dsgw/m4/icu.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- icu.m4	1 Jun 2006 19:43:50 -0000	1.1.1.1
+++ icu.m4	10 Jan 2008 01:19:36 -0000	1.2
@@ -27,14 +27,15 @@
   if test -d "$withval"/lib
   then
     AC_MSG_RESULT([using $withval])
-    ICUDIR=$withval
+    ICUDIR="$withval"
     icu_lib="-L$ICUDIR/lib"
+    icu_libdir="$ICUDIR/lib"
   else
     echo
     AC_MSG_ERROR([$withval not found])
   fi
-  icu_inc=$withval/include
-  icu_bin=$withval/bin
+  icu_inc="-I$withval/include"
+  icu_bin="$withval/bin"
 ],
 AC_MSG_RESULT(no))
 
@@ -61,6 +62,7 @@
   then
     AC_MSG_RESULT([using $withval])
     icu_lib="-L$withval"
+    icu_libdir="$withval"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -82,7 +84,7 @@
   fi
 ],
 AC_MSG_RESULT(no))
-# if not found yet, try pkg-config
+# if ICU is not found yet, try pkg-config
 
 # last resort
 if test -z "$icu_lib"; then
@@ -90,8 +92,10 @@
   AC_PATH_PROG(ICU_CONFIG, icu-config)
   if test -n "$ICU_CONFIG"; then
     icu_lib=`$ICU_CONFIG --ldflags-searchpath`
+    icu_libdir=`$ICU_CONFIG --libdir`
     icu_inc=`$ICU_CONFIG --cppflags-searchpath`
     icu_bin=`$ICU_CONFIG --bindir`
+    AC_MSG_RESULT([using system ICU])
   else
     AC_MSG_ERROR([ICU not found, specify with --with-icu.])
   fi


Index: mozldap.m4
===================================================================
RCS file: /cvs/dirsec/dsgw/m4/mozldap.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- mozldap.m4	1 Jun 2006 19:43:50 -0000	1.1.1.1
+++ mozldap.m4	10 Jan 2008 01:19:36 -0000	1.2
@@ -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
@@ -30,6 +30,8 @@
     LDAPSDKDIR=$withval
     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])
@@ -60,6 +62,7 @@
   then
     AC_MSG_RESULT([using $withval])
     ldapsdk_lib="-L$withval"
+    ldapsdk_libdir="$withval"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -70,18 +73,49 @@
 # if LDAPSDK is not found yet, try pkg-config
 
 # last resort
-if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
-  AC_MSG_CHECKING(for mozldap with pkg-config)
+if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$ldapsdk_bindir"; then
   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 mozldap; then
-      nspr_inc=`$PKG_CONFIG --cflags-only-I mozldap`
-      nspr_lib=`$PKG_CONFIG --libs-only-L mozldap`
+    if $PKG_CONFIG --exists mozldap6; then
+	mozldappkg=mozldap6
+    elif $PKG_CONFIG --exists mozldap; then
+	mozldappkg=mozldap
     else
       AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
     fi
+    ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg`
+    ldapsdk_libdir=`$PKG_CONFIG --variable=libdir $mozldappkg`
+    ldapsdk_lib="-L$ldapsdk_libdir"
+    ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg`
+    AC_MSG_RESULT([using system $mozldappkg])
   fi
 fi
 if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
   AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
 fi
+dnl default path for the ldap c sdk tools (see [210947] for more details)
+if test -z "$ldapsdk_bindir" ; then
+  if [ -d $libdir/mozldap6 ] ; then
+    ldapsdk_bindir=$libdir/mozldap6
+  else
+    ldapsdk_bindir=$libdir/mozldap
+  fi
+fi
+
+dnl make sure the ldap sdk version is 6 or greater - we do not support
+dnl the old 5.x or prior versions - the ldap server code expects the new
+dnl ber types and other code used with version 6
+save_cppflags="$CPPFLAGS"
+CPPFLAGS="$ldapsdk_inc $nss_inc $nspr_inc"
+AC_CHECK_HEADER([ldap.h], [isversion6=1], [isversion6=],
+[#include <ldap-standard.h>
+#if LDAP_VENDOR_VERSION < 600
+#error The LDAP C SDK version is not supported
+#endif
+])
+CPPFLAGS="$save_cppflags"
+
+if test -z "$isversion6" ; then
+  AC_MSG_ERROR([The LDAPSDK version in $ldapsdk_inc/ldap-standard.h is not supported])
+fi


Index: nspr.m4
===================================================================
RCS file: /cvs/dirsec/dsgw/m4/nspr.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nspr.m4	1 Jun 2006 19:43:50 -0000	1.1.1.1
+++ nspr.m4	10 Jan 2008 01:19:36 -0000	1.2
@@ -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
@@ -30,6 +30,7 @@
     NSPRDIR=$withval
     nspr_inc="-I$NSPRDIR/include"
     nspr_lib="-L$NSPRDIR/lib"
+    nspr_libdir="$NSPRDIR/lib"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -60,6 +61,7 @@
   then
     AC_MSG_RESULT([using $withval])
     nspr_lib="-L$withval"
+    nspr_libdir="$withval"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -70,13 +72,20 @@
 # if NSPR is not found yet, try pkg-config
 
 # last resort
-if test -z "$nspr_inc" -o -z "$nspr_lib"; then
-  AC_MSG_CHECKING(for nspr with pkg-config)
+if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then
   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`
       nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
+      nspr_libdir=`$PKG_CONFIG --libs-only-L nspr | sed -e s/-L// | sed -e s/\ .*$//`
+      AC_MSG_RESULT([using system NSPR])
+    elif $PKG_CONFIG --exists dirsec-nspr; then
+      nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr`
+      nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr`
+      nspr_libdir=`$PKG_CONFIG --libs-only-L dirsec-nspr | sed -e s/-L// | sed -e s/\ .*$//`
+      AC_MSG_RESULT([using system dirsec NSPR])
     else
       AC_MSG_ERROR([NSPR not found, specify with --with-nspr.])
     fi


Index: nss.m4
===================================================================
RCS file: /cvs/dirsec/dsgw/m4/nss.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nss.m4	1 Jun 2006 19:43:50 -0000	1.1.1.1
+++ nss.m4	10 Jan 2008 01:19:36 -0000	1.2
@@ -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
@@ -30,6 +30,7 @@
     NSSDIR=$withval
     nss_inc="-I$NSSDIR/include"
     nss_lib="-L$NSSDIR/lib"
+    nss_libdir="$NSSDIR/lib"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -60,6 +61,7 @@
   then
     AC_MSG_RESULT([using $withval])
     nss_lib="-L$withval"
+    nss_libdir="$withval"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -70,13 +72,20 @@
 # if NSS is not found yet, try pkg-config
 
 # last resort
-if test -z "$nss_inc" -o -z "$nss_lib"; then
-  AC_MSG_CHECKING(for nss with pkg-config)
+if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then
   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`
       nss_lib=`$PKG_CONFIG --libs-only-L nss`
+      nss_libdir=`$PKG_CONFIG --variable=libdir nss`
+      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 --variable=libdir dirsec-nss`
+      AC_MSG_RESULT([using system dirsec NSS])
     else
       AC_MSG_ERROR([NSS not found, specify with --with-nss.])
     fi


--- httpd.m4 DELETED ---




More information about the Fedora-directory-commits mailing list