From fedora-directory-commits at redhat.com  Thu Feb  1 14:06:58 2007
From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten))
Date: Thu,  1 Feb 2007 09:06:58 -0500
Subject: [Fedora-directory-commits] mod_nss nss_engine_init.c,1.27,1.28
Message-ID: <200702011406.l11E6wuP021294@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21276

Modified Files:
	nss_engine_init.c 
Log Message:
226747

Fix typo in cipher echde_rsa_null (transposed h and d).



Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nss_engine_init.c	30 Oct 2006 21:12:37 -0000	1.27
+++ nss_engine_init.c	1 Feb 2007 14:06:56 -0000	1.28
@@ -80,7 +80,7 @@
     {"ecdh_rsa_3des_sha", TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, 0, TLS},
     {"ecdh_rsa_aes_128_sha", TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, 0, TLS},
     {"ecdh_rsa_aes_256_sha", TLS_ECDH_RSA_WITH_AES_256_CBC_SHA, 0, TLS},
-    {"echde_rsa_null", TLS_ECDHE_RSA_WITH_NULL_SHA, 0, TLS},
+    {"ecdhe_rsa_null", TLS_ECDHE_RSA_WITH_NULL_SHA, 0, TLS},
     {"ecdhe_rsa_rc4_128_sha", TLS_ECDHE_RSA_WITH_RC4_128_SHA, 0, TLS},
     {"ecdhe_rsa_3des_sha", TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, 0, TLS},
     {"ecdhe_rsa_aes_128_sha", TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, 0, TLS},



From fedora-directory-commits at redhat.com  Thu Feb  1 17:38:00 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu,  1 Feb 2007 12:38:00 -0500
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/servers/plugins Makefile, 1.12, 1.13
Message-ID: <200702011738.l11Hc09h001859@cvs-int.fedora.redhat.com>

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1839

Modified Files:
	Makefile 
Log Message:
Replaced white spaces with a tab to fix "Makefile:125: *** missing separator"



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile	31 Jan 2007 22:49:19 -0000	1.12
+++ Makefile	1 Feb 2007 17:37:57 -0000	1.13
@@ -122,7 +122,7 @@
 	cd views; $(MAKE) $(MFLAGS) all
 
 _dna:
-        cd dna; $(MAKE) $(MFLAGS) all
+	cd dna; $(MAKE) $(MFLAGS) all
 
 clean: 
 	cd rever; $(MAKE) $(MFLAGS) clean



From fedora-directory-commits at redhat.com  Thu Feb  1 18:21:02 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu,  1 Feb 2007 13:21:02 -0500
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/servers/plugins Makefile, 1.13, 1.14
Message-ID: <200702011821.l11IL27Z015447@cvs-int.fedora.redhat.com>

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15429

Modified Files:
	Makefile 
Log Message:
Replaced white spaces with a tab to fix "Makefile:150: *** missing separator"



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile	1 Feb 2007 17:37:57 -0000	1.13
+++ Makefile	1 Feb 2007 18:21:00 -0000	1.14
@@ -147,6 +147,6 @@
 	cd http; $(MAKE) $(MFLAGS) clean
 	cd views; $(MAKE) $(MFLAGS) clean
 	#cd presence; $(MAKE) $(MFLAGS) clean
-        cd dna; $(MAKE) $(MFLAGS) clean
+	cd dna; $(MAKE) $(MFLAGS) clean
 
 veryclean:	clean



From fedora-directory-commits at redhat.com  Fri Feb  2 20:27:37 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri,  2 Feb 2007 15:27:37 -0500
Subject: [Fedora-directory-commits] ldapserver/m4 nspr.m4, 1.3, 1.4 nss.m4,
	1.3, 1.4 mozldap.m4, 1.6, 1.7 sasl.m4, 1.2, 1.3
Message-ID: <200702022027.l12KRbUa015641@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	nspr.m4 nss.m4 mozldap.m4 sasl.m4 
Log Message:
fix build problems on Solaris; minor m4 cleanup


Index: nspr.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/nspr.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nspr.m4	24 Oct 2006 21:11:02 -0000	1.3
+++ nspr.m4	2 Feb 2007 20:27:30 -0000	1.4
@@ -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 @@
 
 # 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`


Index: nss.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/nss.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nss.m4	24 Oct 2006 21:11:02 -0000	1.3
+++ nss.m4	2 Feb 2007 20:27:30 -0000	1.4
@@ -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 @@
 
 # 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`


Index: mozldap.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mozldap.m4	12 Jan 2007 16:18:15 -0000	1.6
+++ mozldap.m4	2 Feb 2007 20:27:30 -0000	1.7
@@ -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 @@
     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 @@
 
 # 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





From fedora-directory-commits at redhat.com  Fri Feb  2 20:27:32 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri,  2 Feb 2007 15:27:32 -0500
Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.13,
	1.14 Makefile.am, 1.18, 1.19 aclocal.m4, 1.9, 1.10 configure,
	1.18, 1.19 Makefile.in, 1.19, 1.20
Message-ID: <200702022028.l12KS2iq015646@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15601

Modified Files:
	configure.ac Makefile.am aclocal.m4 configure Makefile.in 
Log Message:
fix build problems on Solaris; minor m4 cleanup


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure.ac	25 Jan 2007 16:47:45 -0000	1.13
+++ configure.ac	2 Feb 2007 20:27:29 -0000	1.14
@@ -47,9 +47,6 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([setrlimit endpwent ftruncate getcwd gethostbyname inet_ntoa localtime_r memmove memset mkdir munmap putenv rmdir socket strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset])
 
-AC_SUBST([platform_defs])
-AM_CONDITIONAL(SOLARIS,test $platform = solaris)
-
 AC_MSG_CHECKING(for --enable-debug)
 AC_ARG_ENABLE(debug, [  --enable-debug         Enable debug features],
 [
@@ -190,10 +187,12 @@
     platform="solaris"
     ;;
   *)
-    platform_defs=""
     platform=""
     ;;
 esac
+
+AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
+
 AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag])
 AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
 


Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.am	31 Jan 2007 22:49:19 -0000	1.18
+++ Makefile.am	2 Feb 2007 20:27:29 -0000	1.19
@@ -5,7 +5,6 @@
 # Compiler Flags
 #------------------------
 BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
-PLATFORM_DEFINES = @platform_defs@
 DEBUG_DEFINES = @debug_defs@
 DS_DEFINES = -DBUILD_NUM=$(BUILDNUM)
 DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I.
@@ -22,7 +21,7 @@
 PATH_DEFINES = -DLOCALSTATEDIR="\"$(localstatedir)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" \
 	-DLIBDIR="\"$(libdir)\"" -DBINDIR="\"$(bindir)\"" \
 	-DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\""
-AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
+AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
 PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
 
 #------------------------


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.9 -r 1.10 aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- aclocal.m4	26 Jan 2007 20:54:32 -0000	1.9
+++ aclocal.m4	2 Feb 2007 20:27:29 -0000	1.10
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +123,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +143,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,6 +163,7 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -182,15 +183,17 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+_LT_CC_BASENAME([$compiler])
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -231,11 +234,56 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
+
+
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -308,15 +356,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -485,7 +533,7 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -536,6 +584,22 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -567,7 +631,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -577,8 +641,10 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
[...3355 lines suppressed...]
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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.
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -6694,27 +7032,16 @@
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -6768,26 +7095,15 @@
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Helper functions for option handling.                     -*- Autoconf -*-
 
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -6812,28 +7128,16 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-#
-# Check to make sure that the build environment is sane.
-#
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_SANITY_CHECK
 # ---------------
@@ -6876,25 +7180,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# AM_PROG_INSTALL_STRIP
+# ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -6917,25 +7210,13 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004  Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.18 -r 1.19 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure	26 Jan 2007 20:54:32 -0000	1.18
+++ configure	2 Feb 2007 20:27:30 -0000	1.19
@@ -280,15 +280,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/fedora-ds
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
 XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE SOLARIS_TRUE SOLARIS_FALSE LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3819,12 +3819,13 @@
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -3849,10 +3850,11 @@
     fi
   done
 done
-SED=$lt_cv_path_SED
 
 fi
 
+SED=$lt_cv_path_SED
+
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -3929,7 +3931,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -3963,7 +3965,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -3993,6 +3995,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -4003,36 +4014,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
 	  break
 	  ;;
 	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -4079,7 +4097,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[45]*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
@@ -4102,13 +4120,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -4124,7 +4142,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
[...9037 lines suppressed...]
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -19185,7 +18664,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23375,18 +22854,6 @@
 done
 
 
-
-
-
-if test $platform = solaris; then
-  SOLARIS_TRUE=
-  SOLARIS_FALSE='#'
-else
-  SOLARIS_TRUE='#'
-  SOLARIS_FALSE=
-fi
-
-
 echo "$as_me:$LINENO: checking for --enable-debug" >&5
 echo $ECHO_N "checking for --enable-debug... $ECHO_C" >&6
 # Check whether --enable-debug or --disable-debug was given.
@@ -23410,7 +22877,7 @@
 
 # Check for library dependencies
 # 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
@@ -23515,8 +22982,6 @@
 
 # last resort
 if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then
-  echo "$as_me:$LINENO: checking for nspr with pkg-config" >&5
-echo $ECHO_N "checking for nspr with pkg-config... $ECHO_C" >&6
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -23556,6 +23021,8 @@
 echo "${ECHO_T}no" >&6
 fi
 
+  echo "$as_me:$LINENO: checking for nspr with pkg-config" >&5
+echo $ECHO_N "checking for nspr with pkg-config... $ECHO_C" >&6
   if test -n "$PKG_CONFIG"; then
     if $PKG_CONFIG --exists nspr; then
       nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
@@ -23578,7 +23045,7 @@
 fi
 
 # 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
@@ -23683,8 +23150,6 @@
 
 # last resort
 if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then
-  echo "$as_me:$LINENO: checking for nss with pkg-config" >&5
-echo $ECHO_N "checking for nss with pkg-config... $ECHO_C" >&6
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -23724,6 +23189,8 @@
 echo "${ECHO_T}no" >&6
 fi
 
+  echo "$as_me:$LINENO: checking for nss with pkg-config" >&5
+echo $ECHO_N "checking for nss with pkg-config... $ECHO_C" >&6
   if test -n "$PKG_CONFIG"; then
     if $PKG_CONFIG --exists nss; then
       nss_inc=`$PKG_CONFIG --cflags-only-I nss`
@@ -23746,7 +23213,7 @@
 fi
 
 # 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
@@ -23784,6 +23251,7 @@
     ldapsdk_inc="-I$LDAPSDKDIR/include"
     ldapsdk_lib="-L$LDAPSDKDIR/lib"
     ldapsdk_libdir="$LDAPSDKDIR/lib"
+    ldapsdk_bindir="$LDAPSDKDIR/bin"
   else
     echo
     { { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -23851,8 +23319,6 @@
 
 # last resort
 if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$ldapsdk_bindir"; then
-  echo "$as_me:$LINENO: checking for mozldap with pkg-config" >&5
-echo $ECHO_N "checking for mozldap with pkg-config... $ECHO_C" >&6
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -23892,6 +23358,8 @@
 echo "${ECHO_T}no" >&6
 fi
 
+  echo "$as_me:$LINENO: checking for mozldap with pkg-config" >&5
+echo $ECHO_N "checking for mozldap with pkg-config... $ECHO_C" >&6
   if test -n "$PKG_CONFIG"; then
     if $PKG_CONFIG --exists mozldap6; then
 	mozldappkg=mozldap6
@@ -25316,11 +24784,22 @@
     platform="solaris"
     ;;
   *)
-    platform_defs=""
     platform=""
     ;;
 esac
 
+
+
+if test "$platform" = "solaris"; then
+  SOLARIS_TRUE=
+  SOLARIS_FALSE='#'
+else
+  SOLARIS_TRUE='#'
+  SOLARIS_FALSE=
+fi
+
+
+
 cat >>confdefs.h <<\_ACEOF
 #define LDAP_DEBUG 1
 _ACEOF
@@ -25453,17 +24932,17 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${SOLARIS_TRUE}" && test -z "${SOLARIS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"SOLARIS\" was never defined.
+if test -z "${WINNT_TRUE}" && test -z "${WINNT_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"WINNT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"SOLARIS\" was never defined.
+echo "$as_me: error: conditional \"WINNT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${WINNT_TRUE}" && test -z "${WINNT_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"WINNT\" was never defined.
+if test -z "${SOLARIS_TRUE}" && test -z "${SOLARIS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"SOLARIS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"WINNT\" was never defined.
+echo "$as_me: error: conditional \"SOLARIS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26054,6 +25533,7 @@
 s, at CCDEPMODE@,$CCDEPMODE,;t t
 s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s, at SED@,$SED,;t t
 s, at EGREP@,$EGREP,;t t
 s, at LN_S@,$LN_S,;t t
 s, at ECHO@,$ECHO,;t t
@@ -26068,9 +25548,6 @@
 s, at ac_ct_F77@,$ac_ct_F77,;t t
 s, at LIBTOOL@,$LIBTOOL,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
-s, at platform_defs@,$platform_defs,;t t
-s, at SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
-s, at SOLARIS_FALSE@,$SOLARIS_FALSE,;t t
 s, at debug_defs@,$debug_defs,;t t
 s, at PKG_CONFIG@,$PKG_CONFIG,;t t
 s, at ICU_CONFIG@,$ICU_CONFIG,;t t
@@ -26112,6 +25589,8 @@
 s, at scripttemplatedir@,$scripttemplatedir,;t t
 s, at WINNT_TRUE@,$WINNT_TRUE,;t t
 s, at WINNT_FALSE@,$WINNT_FALSE,;t t
+s, at SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
+s, at SOLARIS_FALSE@,$SOLARIS_FALSE,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.19 -r 1.20 Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in	31 Jan 2007 22:49:19 -0000	1.19
+++ Makefile.in	2 Feb 2007 20:27:30 -0000	1.20
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +18,6 @@
 
 
 
-SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) $(migratecred_bin_SOURCES)!
  $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -681,19 +679,19 @@
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \
 	$(libacl_plugin_la_SOURCES) \
@@ -819,6 +817,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -893,7 +892,6 @@
 nss_lib = @nss_lib@
 nss_libdir = @nss_libdir@
 oldincludedir = @oldincludedir@
-platform_defs = @platform_defs@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 propertydir = $(sysconfdir)@propertydir@
@@ -919,7 +917,6 @@
 # Compiler Flags
 #------------------------
 BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
-PLATFORM_DEFINES = @platform_defs@
 DEBUG_DEFINES = @debug_defs@
 DS_DEFINES = -DBUILD_NUM=$(BUILDNUM)
 DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I.
@@ -937,7 +934,7 @@
 	-DLIBDIR="\"$(libdir)\"" -DBINDIR="\"$(bindir)\"" \
 	-DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\""
 
-AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
+AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
 PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
 
 #------------------------
@@ -5040,746 +5037,746 @@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi`
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo: ldap/servers/plugins/acl/acl_ext.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl_ext.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo: ldap/servers/plugins/acl/aclanom.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclanom.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo: ldap/servers/plugins/acl/acleffectiverights.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acleffectiverights.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo: ldap/servers/plugins/acl/aclgroup.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclgroup.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo: ldap/servers/plugins/acl/aclinit.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclinit.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo: ldap/servers/plugins/acl/acllas.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acllas.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo: ldap/servers/plugins/acl/acllist.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acllist.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo: ldap/servers/plugins/acl/aclparse.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclparse.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo: ldap/servers/plugins/acl/aclplugin.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclplugin.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo: ldap/servers/plugins/acl/aclproxy.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclproxy.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo: ldap/servers/plugins/acl/aclutil.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclutil.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c
 
 ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo: ldap/servers/plugins/uiduniq/7bit.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo"; exit 1; fi
[...2985 lines suppressed...]
 lib/libaccess/libns_dshttpd_la-nseframe.lo: lib/libaccess/nseframe.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nseframe.cpp' object='lib/libaccess/libns_dshttpd_la-nseframe.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
 
 lib/libaccess/libns_dshttpd_la-nsautherr.lo: lib/libaccess/nsautherr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nsautherr.cpp' object='lib/libaccess/libns_dshttpd_la-nsautherr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
 
 lib/libaccess/libns_dshttpd_la-oneeval.lo: lib/libaccess/oneeval.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/oneeval.cpp' object='lib/libaccess/libns_dshttpd_la-oneeval.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
 
 lib/libaccess/libns_dshttpd_la-register.lo: lib/libaccess/register.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/register.cpp' object='lib/libaccess/libns_dshttpd_la-register.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
 
 lib/libaccess/libns_dshttpd_la-symbols.lo: lib/libaccess/symbols.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/symbols.cpp' object='lib/libaccess/libns_dshttpd_la-symbols.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
 
 lib/libaccess/libns_dshttpd_la-usi.lo: lib/libaccess/usi.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usi.cpp' object='lib/libaccess/libns_dshttpd_la-usi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
 
 lib/libaccess/libns_dshttpd_la-usrcache.lo: lib/libaccess/usrcache.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usrcache.cpp' object='lib/libaccess/libns_dshttpd_la-usrcache.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
 
 lib/base/libns_dshttpd_la-crit.lo: lib/base/crit.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/crit.cpp' object='lib/base/libns_dshttpd_la-crit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
 
 lib/base/libns_dshttpd_la-dns.lo: lib/base/dns.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dns.cpp' object='lib/base/libns_dshttpd_la-dns.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
 
 lib/base/libns_dshttpd_la-dnsdmain.lo: lib/base/dnsdmain.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dnsdmain.cpp' object='lib/base/libns_dshttpd_la-dnsdmain.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
 
 lib/base/libns_dshttpd_la-ereport.lo: lib/base/ereport.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/ereport.cpp' object='lib/base/libns_dshttpd_la-ereport.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
 
 lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
 
 lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
 
 lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
 
 lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
 
 lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
 
 lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
 
 lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
 
 lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
 
 lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
 
 lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
 
 lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo



From fedora-directory-commits at redhat.com  Fri Feb  2 21:05:33 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri,  2 Feb 2007 16:05:33 -0500
Subject: [Fedora-directory-commits] ldapserver/m4 sasl.m4,1.3,1.4
Message-ID: <200702022105.l12L5XZ9019242@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	sasl.m4 
Log Message:
fix licensing in sasl.m4


Index: sasl.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/sasl.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sasl.m4	2 Feb 2007 20:27:30 -0000	1.3
+++ sasl.m4	2 Feb 2007 21:05:26 -0000	1.4
@@ -1,7 +1,24 @@
+# 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
-# Public domain - Nathan Kinder <nkinder at redhat.com> 2006-06-26
-# Based upon svrcore.m4 (also PD) by Rich Megginson <richm at stanfordalumni.org>
 
 dnl ========================================================
 dnl = sasl is used to support various authentication mechanisms



From fedora-directory-commits at redhat.com  Fri Feb  2 21:05:28 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri,  2 Feb 2007 16:05:28 -0500
Subject: [Fedora-directory-commits] ldapserver aclocal.m4, 1.10,
	1.11 configure, 1.19, 1.20 missing, 1.6, 1.7 install-sh, 1.6,
	1.7 depcomp, 1.6, 1.7 compile, 1.6, 1.7 Makefile.in, 1.20, 1.21
Message-ID: <200702022105.l12L5wWp019248@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19194

Modified Files:
	aclocal.m4 configure missing install-sh depcomp compile 
	Makefile.in 
Log Message:
fix licensing in sasl.m4




Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure	2 Feb 2007 20:27:30 -0000	1.19
+++ configure	2 Feb 2007 21:05:26 -0000	1.20
@@ -23628,10 +23628,27 @@
 
 
 
+# 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
-# Public domain - Nathan Kinder <nkinder at redhat.com> 2006-06-26
-# Based upon svrcore.m4 (also PD) by Rich Megginson <richm at stanfordalumni.org>
 
 { echo "$as_me:$LINENO: checking for sasl..." >&5
 echo "$as_me: checking for sasl..." >&6;}


Index: missing
===================================================================
RCS file: /cvs/dirsec/ldapserver/missing,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- missing	26 Jan 2007 20:54:32 -0000	1.6
+++ missing	2 Feb 2007 21:05:26 -0000	1.7
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2004-09-07.08
+scriptversion=2005-06-08.21
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
@@ -19,8 +19,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake at gnu.org>."
-    exit 0
+    exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
-    exit 0
+    exit $?
     ;;
 
   -*)
@@ -288,11 +288,18 @@
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
     touch $file
     ;;
 


Index: install-sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/install-sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- install-sh	26 Jan 2007 20:54:32 -0000	1.6
+++ install-sh	2 Feb 2007 21:05:26 -0000	1.7
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-09-10.20
+scriptversion=2005-05-14.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -109,7 +109,7 @@
         shift
         continue;;
 
-    --help) echo "$usage"; exit 0;;
+    --help) echo "$usage"; exit $?;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -134,7 +134,7 @@
 	shift
 	continue;;
 
-    --version) echo "$0 $scriptversion"; exit 0;;
+    --version) echo "$0 $scriptversion"; exit $?;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.
@@ -213,7 +213,7 @@
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -226,7 +226,8 @@
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
     IFS=$oIFS
 
     pathcomp=
@@ -295,7 +296,7 @@
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit
+		 (exit 1); exit 1
 	       }
 	     else
 	       :
@@ -306,12 +307,12 @@
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
     }
-  fi || { (exit 1); exit; }
+  fi || { (exit 1); exit 1; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit
+  (exit 0); exit 0
 }
 
 # Local variables:


Index: depcomp
===================================================================
RCS file: /cvs/dirsec/ldapserver/depcomp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- depcomp	26 Jan 2007 20:54:32 -0000	1.6
+++ depcomp	2 Feb 2007 21:05:26 -0000	1.7
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2004-05-31.23
+scriptversion=2005-07-09.11
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # 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
@@ -17,8 +17,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -50,11 +50,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -287,36 +287,43 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mecanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
       "$@" -Wc,-MD
    else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
       exit $stat
    fi
 
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -460,7 +467,8 @@
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"


Index: compile
===================================================================
RCS file: /cvs/dirsec/ldapserver/compile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- compile	26 Jan 2007 20:54:32 -0000	1.6
+++ compile	2 Feb 2007 21:05:26 -0000	1.7
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2004-09-10.20
+scriptversion=2005-05-14.22
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,11 +47,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -125,6 +125,8 @@
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"





From fedora-directory-commits at redhat.com  Fri Feb  2 22:05:31 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  2 Feb 2007 17:05:31 -0500
Subject: [Fedora-directory-commits] esc/coreconf WIN32.mk, NONE,
	1.1 WINNT4.0.mk, NONE, 1.1 WINNT5.0.mk, NONE, 1.1 WINNT5.1.mk,
	NONE, 1.1
Message-ID: <200702022205.l12M5VkV023694@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/coreconf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23676

Added Files:
	WIN32.mk WINNT4.0.mk WINNT5.0.mk WINNT5.1.mk 
Log Message:
Windows support.


--- NEW FILE WIN32.mk ---
# BEGIN COPYRIGHT BLOCK
# 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; version 2 of the License.
#
# 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK

#
# Configuration common to all versions of Windows NT
# and Windows 95
#

DEFAULT_COMPILER = cl

ifdef NS_USE_GCC
	CC           = gcc
	CCC          = g++
	LINK         = ld
	AR           = ar
	AR          += cr $@
	RANLIB       = ranlib
	BSDECHO      = echo
	RC           = windres.exe -O coff --use-temp-file
	LINK_DLL      = $(CC) $(OS_DLLFLAGS) $(DLLFLAGS)
else
	CC           = cl
	CCC          = cl
	LINK         = link
	AR           = lib
	AR          += -NOLOGO -OUT:"$@"
	RANLIB       = echo
	BSDECHO      = echo
	RC           = rc.exe
endif

ifdef BUILD_TREE
NSINSTALL_DIR  = $(BUILD_TREE)/netkey
else
NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
endif
NSINSTALL      = nsinstall

MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
MKDEPEND        = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend.exe
# Note: MKDEPENDENCIES __MUST__ be a relative pathname, not absolute.
# If it is absolute, gmake will crash unless the named file exists.
MKDEPENDENCIES  = $(OBJDIR_NAME)/depend.mk

INSTALL      = $(NSINSTALL)
MAKE_OBJDIR  = mkdir
MAKE_OBJDIR += $(OBJDIR)
GARBAGE     += $(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb
XP_DEFINE   += -DXP_PC
ifdef NS_USE_GCC
LIB_SUFFIX   = a
else
LIB_SUFFIX   = lib
endif
DLL_SUFFIX   = dll

ifdef NS_USE_GCC
    OS_CFLAGS += -mno-cygwin -mms-bitfields
    _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
    DLLFLAGS  += -mno-cygwin -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
    ifdef BUILD_OPT
	OPTIMIZER  += -O2
	DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
	#
	# Add symbolic information for a profiler
	#
	ifdef MOZ_PROFILE
		OPTIMIZER += -g
	endif
    else
	OPTIMIZER  += -g
	NULLSTRING :=
	SPACE      := $(NULLSTRING) # end of the line
	USERNAME   := $(subst $(SPACE),_,$(USERNAME))
	USERNAME   := $(subst -,_,$(USERNAME))
	DEFINES    += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
    endif
else # !NS_USE_GCC
	OS_CFLAGS  += -GX
    ifdef BUILD_OPT
	ifdef USE_STATIC_RTL
	OS_CFLAGS  += -MT
	else
	OS_CFLAGS  += -MD
	endif
	OPTIMIZER  += -O2
	DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
	DLLFLAGS   += -OUT:"$@"
	#
	# Add symbolic information for a profiler
	#
	ifdef MOZ_PROFILE
		OPTIMIZER += -Z7
		DLLFLAGS += -DEBUG -DEBUGTYPE:CV
	endif
    else
	#
	# Define USE_DEBUG_RTL if you want to use the debug runtime library
	# (RTL) in the debug build
	#
	ifdef USE_STATIC_RTL
	ifdef USE_DEBUG_RTL
		OS_CFLAGS += -MTd
	else
		OS_CFLAGS += -MT
	endif
	else
	ifdef USE_DEBUG_RTL
		OS_CFLAGS += -MDd
	else
		OS_CFLAGS += -MD
	endif
	endif
	OPTIMIZER  += -Od -Z7
	#OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
	NULLSTRING :=
	SPACE      := $(NULLSTRING) # end of the line
	USERNAME   := $(subst $(SPACE),_,$(USERNAME))
	USERNAME   := $(subst -,_,$(USERNAME))
	DEFINES    += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
	DLLFLAGS   += -DEBUG -DEBUGTYPE:CV -OUT:"$@"
	LDFLAGS    += -DEBUG -DEBUGTYPE:CV -PDB:NONE
    endif
endif # NS_USE_GCC

DEFINES += -DWIN32
ifdef MAPFILE
ifndef NS_USE_GCC
DLLFLAGS += -DEF:$(MAPFILE)
endif
endif
# Change PROCESS to put the mapfile in the correct format for this platform
PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@


#
#  The following is NOT needed for the NSPR 2.0 library.
#

DEFINES += -D_WINDOWS

# override default, which is ASFLAGS = CFLAGS
ifdef NS_USE_GCC
	AS	= $(CC)
	ASFLAGS = $(INCLUDES)
else
	AS	= ml.exe
	ASFLAGS = -Cp -Sn -Zi -coff $(INCLUDES)
endif

#
# override the definitions of RELEASE_TREE found in tree.mk
#
ifndef RELEASE_TREE
    ifdef BUILD_SHIP
	ifdef USE_SHIPS
	    RELEASE_TREE = $(NTBUILD_SHIP)
	else
	    RELEASE_TREE = http://tsunami.dsdev.sjc.redhat.com/share/builds/components
	endif
    else
	RELEASE_TREE = http://tsunami.dsdev.sjc.redhat.com/share/builds/components
    endif
endif

#
# override the definitions of IMPORT_LIB_PREFIX, LIB_PREFIX, and
# DLL_PREFIX in prefix.mk
#

ifndef IMPORT_LIB_PREFIX
    ifdef NS_USE_GCC
	IMPORT_LIB_PREFIX = lib
    else
	IMPORT_LIB_PREFIX = $(NULL)
    endif
endif

ifndef LIB_PREFIX
    ifdef NS_USE_GCC
	LIB_PREFIX = lib
    else
	LIB_PREFIX = $(NULL)
    endif
endif

ifndef DLL_PREFIX
    DLL_PREFIX =  $(NULL)
endif

#
# override the definitions of various _SUFFIX symbols in suffix.mk
#

#
# Object suffixes
#
ifndef OBJ_SUFFIX
    ifdef NS_USE_GCC
	OBJ_SUFFIX = .o
    else
	OBJ_SUFFIX = .obj
    endif
endif

#
# Assembler source suffixes
#
ifndef ASM_SUFFIX
    ifdef NS_USE_GCC
	ASM_SUFFIX = .s
    else
	ASM_SUFFIX = .asm
    endif
endif

#
# Library suffixes
#

ifndef IMPORT_LIB_SUFFIX
    IMPORT_LIB_SUFFIX = .$(LIB_SUFFIX)
endif

ifndef DYNAMIC_LIB_SUFFIX_FOR_LINKING
    DYNAMIC_LIB_SUFFIX_FOR_LINKING = $(IMPORT_LIB_SUFFIX)
endif

#
# Program suffixes
#
ifndef PROG_SUFFIX
    PROG_SUFFIX = .exe
endif

#
# When the processor is NOT 386-based on Windows NT, override the
# value of $(CPU_TAG).  For WinNT, 95, 16, not CE.
#
ifneq ($(CPU_ARCH),x386)
    CPU_TAG = _$(CPU_ARCH)
endif

#
# override ruleset.mk, removing the "lib" prefix for library names, and
# adding the "32" after the LIBRARY_VERSION.
#
ifdef LIBRARY_NAME
    SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).dll
    IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).lib
endif

#
# override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
#
ifndef TARGETS
    TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM) $(SCRIPTS)
endif



--- NEW FILE WINNT4.0.mk ---
# BEGIN COPYRIGHT BLOCK
# 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; version 2 of the License.
#
# 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#

#
# Config stuff for WINNT 4.0
#
# This makefile defines the following variables:
# OS_CFLAGS and OS_DLLFLAGS.

include $(CORE_DEPTH)/coreconf/WIN32.mk

ifeq ($(CPU_ARCH), x386)
	OS_CFLAGS += -W3 -nologo
	DEFINES += -D_X86_
else 
	ifeq ($(CPU_ARCH), MIPS)
		#OS_CFLAGS += -W3 -nologo
		#DEFINES += -D_MIPS_
		OS_CFLAGS += -W3 -nologo
	else 
		ifeq ($(CPU_ARCH), ALPHA)
			OS_CFLAGS += -W3 -nologo
			DEFINES += -D_ALPHA_=1
		endif
	endif
endif

OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
#
# Win NT needs -GT so that fibers can work
#
OS_CFLAGS += -GT
DEFINES += -DWINNT

NSPR31_LIB_PREFIX = lib


--- NEW FILE WINNT5.0.mk ---
# BEGIN COPYRIGHT BLOCK
# 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; version 2 of the License.
#
# 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK

#
# Config stuff for WINNT 5.0 (Windows 2000)
#
# This makefile defines the following variables:
# OS_CFLAGS and OS_DLLFLAGS.

include $(CORE_DEPTH)/coreconf/WIN32.mk

ifeq ($(CPU_ARCH), x386)
	OS_CFLAGS += -W3 -nologo
	DEFINES += -D_X86_
else 
	ifeq ($(CPU_ARCH), MIPS)
		#OS_CFLAGS += -W3 -nologo
		#DEFINES += -D_MIPS_
		OS_CFLAGS += -W3 -nologo
	else 
		ifeq ($(CPU_ARCH), ALPHA)
			OS_CFLAGS += -W3 -nologo
			DEFINES += -D_ALPHA_=1
		endif
	endif
endif

OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
#
# Win NT needs -GT so that fibers can work
#
OS_CFLAGS += -GT
DEFINES += -DWINNT

NSPR31_LIB_PREFIX = lib


--- NEW FILE WINNT5.1.mk ---
# BEGIN COPYRIGHT BLOCK
# 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; version 2 of the License.
#
# 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK

#
# Config stuff for WINNT 5.1 (Windows XP)
#
# This makefile defines the following variables:
# OS_CFLAGS and OS_DLLFLAGS.

include $(CORE_DEPTH)/coreconf/WIN32.mk

ifeq ($(CPU_ARCH), x386)
	OS_CFLAGS += -W3 -nologo
	DEFINES += -D_X86_
else 
	ifeq ($(CPU_ARCH), MIPS)
		#OS_CFLAGS += -W3 -nologo
		#DEFINES += -D_MIPS_
		OS_CFLAGS += -W3 -nologo
	else 
		ifeq ($(CPU_ARCH), ALPHA)
			OS_CFLAGS += -W3 -nologo
			DEFINES += -D_ALPHA_=1
		endif
	endif
endif

OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
#
# Win NT needs -GT so that fibers can work
#
OS_CFLAGS += -GT
DEFINES += -DWINNT

NSPR31_LIB_PREFIX = lib



From fedora-directory-commits at redhat.com  Fri Feb  2 22:13:56 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  2 Feb 2007 17:13:56 -0500
Subject: [Fedora-directory-commits] esc/src/app/xpcom Makefile.moz,1.5,1.6
Message-ID: <200702022213.l12MDuUb023769@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23750

Modified Files:
	Makefile.moz 
Log Message:
Changes for Windows.



Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.moz,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.moz	10 Jan 2007 02:20:13 -0000	1.5
+++ Makefile.moz	2 Feb 2007 22:13:54 -0000	1.6
@@ -35,9 +35,9 @@
 
 DEPLOY_OBJDIR           = $(CORE_DEPTH)/dist/$(OBJDIR)/esc_build
 
-XULRUNNER_ZIP_NAME	= xulrunner-1.8.0.1.*.tar.gz 
+XULRUNNER_ZIP_NAME	= xulrunner-1.8.0.4.*.tar.gz 
 ifeq ($(OS_ARCH),WINNT)
-XULRUNNER_ZIP_NAME	= xulrunner-1.8.0.1.*.win32.zip
+XULRUNNER_ZIP_NAME	= xulrunner-1.8.0.4.*.win32.zip
 endif
 XULRUNNER_BIN_PATH	= $(MOZ_OBJDIR)/dist/xulrunner
 XULRUNNER_EXEC		= xulrunner
@@ -75,7 +75,8 @@
 
 
 ifeq ($(OS_ARCH),WINNT)
-COOLKEY_LIBS	= $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib  $(CKY_LIB_LDD) $(CORE_DIST)/lib/ckyapplet.lib
+COOLKEY_LIBS	= $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib  $(CKY_LIB_LDD)/libckyapplet.lib
+OS_LIBS+= /NODEFAULTLIB:libc.lib
 TESTCPPSRCS	= CoolKeyCSP.cpp
 MOZ_NO_DEBUG_RTL=1
 else
@@ -212,7 +213,7 @@
 endif
 ifeq ($(OS_ARCH),WINNT)
 	unzip $(MOZ_OBJDIR)/dist/$(XULRUNNER_ZIP_NAME) -d $(DEPLOY_OBJDIR)/$(XULRUNNER_FRAME_DEST)/esc
-	cp -f $(XPCOM_EXTRA)  $(DEPLOY_OBJDIR)/ESC/components
+	#cp -f $(XPCOM_EXTRA)  $(DEPLOY_OBJDIR)/ESC/components
 endif
 ifdef DESTDIR
 	$(NSINSTALL) $(DEPLOY_OBJDIR) $(DESTDIR)



From fedora-directory-commits at redhat.com  Fri Feb  2 23:56:47 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  2 Feb 2007 18:56:47 -0500
Subject: [Fedora-directory-commits] esc/src/lib/coolkey common.mk,1.1,1.2
Message-ID: <200702022356.l12Nulp9028229@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28213

Modified Files:
	common.mk 
Log Message:
Fix for Windows.



Index: common.mk
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/common.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- common.mk	10 Jan 2007 02:22:26 -0000	1.1
+++ common.mk	2 Feb 2007 23:56:45 -0000	1.2
@@ -79,8 +79,8 @@
 DEFINES += -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr
 CFLAGS +=  $(OSX_ARCH_FLAGS)  
 
+endif
 ifdef CKY_INCLUDE
-CFLAGS += -I $(CKY_INCLUDE)
+CFLAGS +=  $(CKY_INCLUDE)
 endif
 
-endif



From fedora-directory-commits at redhat.com  Sat Feb  3 01:22:22 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  2 Feb 2007 20:22:22 -0500
Subject: [Fedora-directory-commits] coolkey aclocal.m4,1.2,1.3
Message-ID: <200702030122.l131MMg4002883@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2867

Modified Files:
	aclocal.m4 
Log Message:
Remove some comments that were disturbing the Windows build.



Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/coolkey/aclocal.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aclocal.m4	25 Aug 2006 00:31:39 -0000	1.2
+++ aclocal.m4	3 Feb 2007 01:22:20 -0000	1.3
@@ -3041,10 +3041,7 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      #
-      # Hack... gcc and lc are quite different, we can use either for cygwin
-      # try to get a line that both are happy with...
-      #
+
       $CC -LD -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker '
     else
       _LT_AC_TAGVAR(ld_shlibs, $1)=no



From fedora-directory-commits at redhat.com  Mon Feb  5 22:30:19 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Mon,  5 Feb 2007 17:30:19 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
	template-start-slapd, 1.1, 1.2 template-stop-slapd, 1.1, 1.2
Message-ID: <200702052230.l15MUJD7029873@cvs-int.fedora.redhat.com>

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722/src/scripts

Modified Files:
	template-start-slapd template-stop-slapd 
Log Message:
Resolves: 223861
Summary: Nightly build uses autotools/yum (Comment #32)
Changes: Makefile: moved scripts temlate dir from /etc to /usr/share
template-{start,stop}-slapd: modified the pid and startpid name to
slapd-<id>.pid and slapd-<id>.startpid.
Note: these changes do not affect the new build using autotools.  The 3 files
would be eliminated when we move to the new build completely.  The fix is for
keeping the nightly acceptance tests healthy by the transfer is completed.



Index: template-start-slapd
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-start-slapd	27 Oct 2006 16:45:18 -0000	1.1
+++ template-start-slapd	5 Feb 2007 22:30:12 -0000	1.2
@@ -16,8 +16,8 @@
 export NETSITE_ROOT
 DS_CONFIG_DIR={{CONFIG-DIR}}
 export DS_CONFIG_DIR
-PIDFILE={{RUN-DIR}}/pid
-STARTPIDFILE={{RUN-DIR}}/startpid
+PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid
+STARTPIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.startpid
 if test -f $STARTPIDFILE ; then
     PID=`cat $STARTPIDFILE`
     if kill -0 $PID > /dev/null 2>&1 ; then


Index: template-stop-slapd
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-stop-slapd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-stop-slapd	27 Oct 2006 16:45:18 -0000	1.1
+++ template-stop-slapd	5 Feb 2007 22:30:12 -0000	1.2
@@ -12,7 +12,7 @@
 #       1: Server could not be stopped
 #       2: Server was not running
 
-PIDFILE={{RUN-DIR}}/pid
+PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid
 if test ! -f $PIDFILE ; then
     echo No ns-slapd PID file found. Server is probably not running
     exit 2



From fedora-directory-commits at redhat.com  Mon Feb  5 22:30:14 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Mon,  5 Feb 2007 17:30:14 -0500
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/admin/src Makefile, 1.21, 1.22
Message-ID: <200702052230.l15MUiaH029876@cvs-int.fedora.redhat.com>

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29722/src

Modified Files:
	Makefile 
Log Message:
Resolves: 223861
Summary: Nightly build uses autotools/yum (Comment #32)
Changes: Makefile: moved scripts temlate dir from /etc to /usr/share
template-{start,stop}-slapd: modified the pid and startpid name to
slapd-<id>.pid and slapd-<id>.startpid.
Note: these changes do not affect the new build using autotools.  The 3 files
would be eliminated when we move to the new build completely.  The fix is for
keeping the nightly acceptance tests healthy by the transfer is completed.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile	14 Nov 2006 17:37:38 -0000	1.21
+++ Makefile	5 Feb 2007 22:30:12 -0000	1.22
@@ -51,7 +51,7 @@
 include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
-SCRIPTSDIR=$(RELDIR)/$(DS_ETCDIR)/script-templates
+SCRIPTSDIR=$(RELDIR)/$(DS_DATADIR)/script-templates
 
 ifeq ($(USE_ADMINSERVER), 1)
 MCC_INCLUDE += $(ADMINUTIL_INCLUDE)



From fedora-directory-commits at redhat.com  Tue Feb  6 15:51:29 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue,  6 Feb 2007 10:51:29 -0500
Subject: [Fedora-directory-commits] ldapserver/m4 nspr.m4, 1.4, 1.5 nss.m4,
	1.4, 1.5 mozldap.m4, 1.7, 1.8 db.m4, 1.4, 1.5
Message-ID: <200702061551.l16FpTHM000805@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	nspr.m4 nss.m4 mozldap.m4 db.m4 
Log Message:
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 



Index: nspr.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/nspr.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nspr.m4	2 Feb 2007 20:27:30 -0000	1.4
+++ nspr.m4	6 Feb 2007 15:51:22 -0000	1.5
@@ -79,12 +79,12 @@
     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/\ *$//`
+      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/\ *$//`
+      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.])


Index: nss.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/nss.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nss.m4	2 Feb 2007 20:27:30 -0000	1.4
+++ nss.m4	6 Feb 2007 15:51:22 -0000	1.5
@@ -79,12 +79,12 @@
     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.])


Index: mozldap.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mozldap.m4	2 Feb 2007 20:27:30 -0000	1.7
+++ mozldap.m4	6 Feb 2007 15:51:22 -0000	1.8
@@ -86,7 +86,7 @@
     fi
     ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg`
     ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg`
-    ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\ *$//`
+    ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\ .*$//`
     ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg`
     AC_MSG_RESULT([using system $mozldappkg])
   fi


Index: db.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- db.m4	12 Jan 2007 16:18:15 -0000	1.4
+++ db.m4	6 Feb 2007 15:51:22 -0000	1.5
@@ -72,6 +72,8 @@
 dnl libname is libdb-maj.min e.g. libdb-4.2
 db_libver=${db_ver_maj}.${db_ver_min}
 dnl make sure the lib is available
-AC_CHECK_LIB([db-$db_libver], [db_create], [],
-  [AC_MSG_ERROR([$db_incdir/db.h is version $db_libver but libdb-$db_libver not found])])
+dnl use true so libdb won't be added to LIBS
+AC_CHECK_LIB([db-$db_libver], [db_create], [true],
+  [AC_MSG_ERROR([$db_incdir/db.h is version $db_libver but libdb-$db_libver not found])],
+  [$LIBNSL])
 



From fedora-directory-commits at redhat.com  Tue Feb  6 15:51:24 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue,  6 Feb 2007 10:51:24 -0500
Subject: [Fedora-directory-commits] ldapserver aclocal.m4, 1.11,
	1.12 Makefile.am, 1.19, 1.20 Makefile.in, 1.21,
	1.22 config.guess, 1.5, 1.6 config.sub, 1.5, 1.6 configure,
	1.20, 1.21 configure.ac, 1.14, 1.15 ltmain.sh, 1.4, 1.5
Message-ID: <200702061551.l16Fpsnw000810@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv752

Modified Files:
	aclocal.m4 Makefile.am Makefile.in config.guess config.sub 
	configure configure.ac ltmain.sh 
Log Message:
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 





Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.am	2 Feb 2007 20:27:29 -0000	1.19
+++ Makefile.am	6 Feb 2007 15:51:22 -0000	1.20
@@ -37,6 +37,10 @@
 NETSNMP_LINK = @netsnmp_lib@ @netsnmp_link@
 PAM_LINK = -lpam
 
+LIBSOCKET=@LIBSOCKET@
+LIBNSL=@LIBNSL@
+LIBDL=@LIBDL@
+
 #------------------------
 # Generated Sources
 #------------------------
@@ -680,7 +684,7 @@
 	ldap/servers/plugins/replication/windows_protocol_util.c \
 	ldap/servers/plugins/replication/windows_tot_protocol.c
 
-libreplication_plugin_la_CPPFLAGS = @icu_inc@ @db_inc@ $(PLUGIN_CPPFLAGS)
+libreplication_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ @db_inc@
 libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK)
 
 #------------------------
@@ -764,7 +768,7 @@
 	ldap/admin/src/script-gen.c
 
 ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
 
 #------------------------
 # dsktune
@@ -780,7 +784,7 @@
 	ldap/servers/slapd/tools/rsearch/nametable.c
 
 infadd_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKET)
 
 #------------------------
 # ldap-agent
@@ -812,7 +816,7 @@
 endif
 
 ldclt_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(LIBDL)
 
 #------------------------
 # ldif
@@ -878,7 +882,7 @@
 ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) @sasl_inc@ @ldapsdk_inc@ @nss_inc@ \
 	@nspr_inc@ @svrcore_inc@
 ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \
-	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK)
+	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET)
 
 #------------------------
 # pwdhash
@@ -897,7 +901,7 @@
 	ldap/servers/slapd/tools/rsearch/searchthread.c
 
 rsearch_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKET)
 
 # these are for the config files and scripts that we need to generate and replace
 # the paths and other tokens with the real values set during configure/make


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.in	2 Feb 2007 21:05:26 -0000	1.21
+++ Makefile.in	6 Feb 2007 15:51:22 -0000	1.22
@@ -554,6 +554,7 @@
 ds_newinst_bin_OBJECTS = $(am_ds_newinst_bin_OBJECTS)
 ds_newinst_bin_DEPENDENCIES = libds_admin.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_dsktune_bin_OBJECTS = ldap/systools/idsktune.$(OBJEXT) \
 	ldap/systools/pio.$(OBJEXT)
@@ -564,7 +565,8 @@
 	ldap/servers/slapd/tools/rsearch/infadd_bin-nametable.$(OBJEXT)
 infadd_bin_OBJECTS = $(am_infadd_bin_OBJECTS)
 infadd_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_ldap_agent_bin_OBJECTS =  \
 	ldap/servers/snmp/ldap_agent_bin-main.$(OBJEXT) \
 	ldap/servers/snmp/ldap_agent_bin-ldap-agent.$(OBJEXT) \
@@ -599,7 +601,9 @@
 	$(am__objects_3)
 ldclt_bin_OBJECTS = $(am_ldclt_bin_OBJECTS)
 ldclt_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_ldif_bin_OBJECTS =  \
 	ldap/servers/slapd/tools/ldif_bin-ldif.$(OBJEXT)
 ldif_bin_OBJECTS = $(am_ldif_bin_OBJECTS)
@@ -656,6 +660,7 @@
 ns_slapd_DEPENDENCIES = libslapd.la libldaputil.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_pwdhash_bin_OBJECTS =  \
 	ldap/servers/slapd/tools/pwdhash_bin-pwenc.$(OBJEXT)
@@ -669,7 +674,8 @@
 	ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.$(OBJEXT)
 rsearch_bin_OBJECTS = $(am_rsearch_bin_OBJECTS)
 rsearch_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 serverSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 taskSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -797,8 +803,11 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
+LIBDL = @LIBDL@
+LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBSOCKET = @LIBSOCKET@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -1550,7 +1559,7 @@
 	ldap/servers/plugins/replication/windows_protocol_util.c \
 	ldap/servers/plugins/replication/windows_tot_protocol.c
 
-libreplication_plugin_la_CPPFLAGS = @icu_inc@ @db_inc@ $(PLUGIN_CPPFLAGS)
+libreplication_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ @db_inc@
 libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK)
 
 #------------------------
@@ -1629,7 +1638,7 @@
 	ldap/admin/src/script-gen.c
 
 ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET)
 
 #------------------------
 # dsktune
@@ -1646,7 +1655,7 @@
 	ldap/servers/slapd/tools/rsearch/nametable.c
 
 infadd_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKET)
 
 #------------------------
 # ldap-agent
@@ -1673,7 +1682,7 @@
 	ldap/servers/slapd/tools/ldclt/version.c \
 	ldap/servers/slapd/tools/ldclt/workarounds.c $(am__append_1)
 ldclt_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(LIBDL)
 
 #------------------------
 # ldif
@@ -1737,7 +1746,7 @@
 	@nspr_inc@ @svrcore_inc@
 
 ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \
-	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK)
+	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET)
 
 
 #------------------------
@@ -1756,7 +1765,7 @@
 	ldap/servers/slapd/tools/rsearch/searchthread.c
 
 rsearch_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK)
+rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKET)
 
 # these are for the config files and scripts that we need to generate and replace
 # the paths and other tokens with the real values set during configure/make


Index: config.guess
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.guess,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.guess	26 Jan 2007 20:54:32 -0000	1.5
+++ config.guess	6 Feb 2007 15:51:22 -0000	1.6
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-09-07'
+timestamp='2005-07-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per at bothner.com>.
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +68,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -123,7 +125,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi at noc.rutgers.edu 1994-08-24)
@@ -196,55 +198,20 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,37 +264,43 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -335,32 +308,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -369,10 +342,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -384,10 +357,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -398,40 +371,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -455,32 +428,33 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -496,29 +470,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -526,7 +500,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -541,14 +515,18 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -562,28 +540,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -645,9 +623,19 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -655,11 +643,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -687,158 +675,166 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
+	exit ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -856,7 +852,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -875,14 +871,14 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -896,7 +892,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -904,25 +900,25 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -940,15 +936,15 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -976,15 +972,18 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -992,27 +991,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1020,15 +1019,16 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1046,73 +1046,73 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1120,61 +1120,65 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel at ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf at swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green at stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1182,7 +1186,7 @@
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1190,22 +1194,25 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1216,38 +1223,44 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1279,7 +1292,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1368,11 +1381,12 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1381,22 +1395,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1407,7 +1421,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be


Index: config.sub
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.sub,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.sub	26 Jan 2007 20:54:32 -0000	1.5
+++ config.sub	6 Feb 2007 15:51:22 -0000	1.6
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-08-29'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@
 #
 # 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -231,13 +232,14 @@
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -246,6 +248,7 @@
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -254,23 +257,28 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -298,7 +306,7 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -310,7 +318,7 @@
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -319,6 +327,7 @@
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -327,6 +336,7 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -334,20 +344,23 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -489,6 +502,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -754,9 +771,8 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1029,6 +1045,10 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1078,12 +1098,9 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1170,7 +1187,8 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1188,7 +1206,7 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1297,6 +1315,9 @@
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1374,6 +1395,9 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1545,7 +1569,7 @@
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)


Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure	2 Feb 2007 21:05:26 -0000	1.20
+++ configure	6 Feb 2007 15:51:22 -0000	1.21
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/fedora-ds
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE SOLARIS_TRUE SOLARIS_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -22875,6 +22875,246 @@
 
 
 
+# installation paths - by default, configure will just
+# use /usr as the prefix for everything, which means
+# /usr/etc and /usr/var.  FHS sez to use /etc and /var.
+if test "$with_fhs" = "yes"; then
+  ac_default_prefix=/usr
+  prefix=$ac_default_prefix
+  exec_prefix=$prefix
+  sysconfdir='/etc'
+  localstatedir='/var'
+fi
+
+# relative to sysconfdir
+configdir=/fedora-ds/config
+# relative to datadir
+sampledatadir=/fedora-ds/data
+# relative to sysconfdir
+propertydir=/fedora-ds/property
+# relative to sysconfdir
+schemadir=/fedora-ds/schema
+# relative to libdir
+serverdir=/fedora-ds
+# relative to libdir
+serverplugindir=/fedora-ds/plugins
+# relative to datadir
+scripttemplatedir=/fedora-ds/script-templates
+
+
+
+
+
+
+
+
+# WINNT should be true if building on Windows system not using
+# cygnus, mingw, or the like and using cmd.exe as the shell
+
+
+if false; then
+  WINNT_TRUE=
+  WINNT_FALSE='#'
+else
+  WINNT_TRUE='#'
+  WINNT_FALSE=
+fi
+
+
+# Deal with platform dependent defines
+case $host in
+  *-*-linux*)
+
+cat >>confdefs.h <<\_ACEOF
+#define XP_UNIX 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define Linux 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define LINUX 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define LINUX2_0 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define LINUX2_2 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define LINUX2_4 1
+_ACEOF
+
+    platform="linux"
+    ;;
+  ia64-hp-hpux*)
+
+cat >>confdefs.h <<\_ACEOF
+#define XP_UNIX 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define hpux 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HPUX 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HPUX11 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HPUX11_23 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define CPU_ia64
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define OS_hpux 1
+_ACEOF
+
+    platform="hpux"
+    ;;
+  hppa*-hp-hpux*)
+
+cat >>confdefs.h <<\_ACEOF
+#define XP_UNIX 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define hpux 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HPUX 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HPUX11 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HPUX11_11 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define CPU_hppa
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define OS_hpux 1
+_ACEOF
+
+    platform="hpux"
+    ;;
+  sparc-sun-solaris*)
+
+cat >>confdefs.h <<\_ACEOF
+#define XP_UNIX 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define SVR4 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define __svr4 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define __svr4__ 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _SVID_GETTOD 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define SOLARIS 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define CPU_sparc
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define OS_solaris 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define sunos5 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define OSVERSION 509
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _REENTRANT 1
+_ACEOF
+
+    LIBSOCKET=-lsocket
+    LIBSOCKET=$LIBSOCKET
+
+    LIBNSL=-lnsl
+    LIBNSL=$LIBNSL
+
+    LIBDL=-ldl
+    LIBDL=$LIBDL
+
+    platform="solaris"
+    ;;
+  *)
+    platform=""
+    ;;
+esac
+
+
+
+if test "$platform" = "solaris"; then
+  SOLARIS_TRUE=
+  SOLARIS_FALSE='#'
+else
+  SOLARIS_TRUE='#'
+  SOLARIS_FALSE=
+fi
+
+
 # Check for library dependencies
 # BEGIN COPYRIGHT BLOCK
 # Copyright (C) 2007 Red Hat, Inc.
@@ -23027,13 +23267,13 @@
     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/\ *$//`
+      nspr_libdir=`$PKG_CONFIG --libs-only-L nspr | sed -e s/-L// | sed -e s/\ .*$//`
       echo "$as_me:$LINENO: result: using system NSPR" >&5
 echo "${ECHO_T}using system NSPR" >&6
     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/\ *$//`
+      nspr_libdir=`$PKG_CONFIG --libs-only-L dirsec-nspr | sed -e s/-L// | sed -e s/\ .*$//`
       echo "$as_me:$LINENO: result: using system dirsec NSPR" >&5
 echo "${ECHO_T}using system dirsec NSPR" >&6
     else
@@ -23195,13 +23435,13 @@
     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/\ .*$//`
       echo "$as_me:$LINENO: result: using system NSS" >&5
 echo "${ECHO_T}using system NSS" >&6
     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/\ .*$//`
       echo "$as_me:$LINENO: result: using system dirsec NSS" >&5
 echo "${ECHO_T}using system dirsec NSS" >&6
     else
@@ -23372,7 +23612,7 @@
     fi
     ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg`
     ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg`
-    ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\ *$//`
+    ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\ .*$//`
     ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg`
     echo "$as_me:$LINENO: result: using system $mozldappkg" >&5
 echo "${ECHO_T}using system $mozldappkg" >&6
@@ -23547,7 +23787,6 @@
 db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h | awk '{print $3}'`
 db_ver_pat=`grep DB_VERSION_PATCH $db_incdir/db.h | awk '{print $3}'`
 db_libver=${db_ver_maj}.${db_ver_min}
-
 as_ac_Lib=`echo "ac_cv_lib_db-$db_libver''_db_create" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for db_create in -ldb-$db_libver" >&5
 echo $ECHO_N "checking for db_create in -ldb-$db_libver... $ECHO_C" >&6
@@ -23555,7 +23794,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb-$db_libver  $LIBS"
+LIBS="-ldb-$db_libver $LIBNSL $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23614,12 +23853,7 @@
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_LIBdb-$db_libver" | $as_tr_cpp` 1
-_ACEOF
-
-  LIBS="-ldb-$db_libver $LIBS"
-
+  true
 else
   { { echo "$as_me:$LINENO: error: $db_incdir/db.h is version $db_libver but libdb-$db_libver not found" >&5
 echo "$as_me: error: $db_incdir/db.h is version $db_libver but libdb-$db_libver not found" >&2;}
@@ -24585,237 +24819,6 @@
 
 
 
-# installation paths - by default, configure will just
-# use /usr as the prefix for everything, which means
-# /usr/etc and /usr/var.  FHS sez to use /etc and /var.
-if test "$with_fhs" = "yes"; then
-  ac_default_prefix=/usr
-  prefix=$ac_default_prefix
-  exec_prefix=$prefix
-  sysconfdir='/etc'
-  localstatedir='/var'
-fi
-
-# relative to sysconfdir
-configdir=/fedora-ds/config
-# relative to datadir
-sampledatadir=/fedora-ds/data
-# relative to sysconfdir
-propertydir=/fedora-ds/property
-# relative to sysconfdir
-schemadir=/fedora-ds/schema
-# relative to libdir
-serverdir=/fedora-ds
-# relative to libdir
-serverplugindir=/fedora-ds/plugins
-# relative to datadir
-scripttemplatedir=/fedora-ds/script-templates
-
-
-
-
-
-
-
-
-# WINNT should be true if building on Windows system not using
-# cygnus, mingw, or the like and using cmd.exe as the shell
-
-
-if false; then
-  WINNT_TRUE=
-  WINNT_FALSE='#'
-else
-  WINNT_TRUE='#'
-  WINNT_FALSE=
-fi
-
-
-# Deal with platform dependent defines
-case $host in
-  *-*-linux*)
-
-cat >>confdefs.h <<\_ACEOF
-#define XP_UNIX 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define Linux 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define LINUX 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define LINUX2_0 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define LINUX2_2 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define LINUX2_4 1
-_ACEOF
-
-    platform="linux"
-    ;;
-  ia64-hp-hpux*)
-
-cat >>confdefs.h <<\_ACEOF
-#define XP_UNIX 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define hpux 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HPUX 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HPUX11 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HPUX11_23 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define CPU_ia64
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define OS_hpux 1
-_ACEOF
-
-    platform="hpux"
-    ;;
-  hppa*-hp-hpux*)
-
-cat >>confdefs.h <<\_ACEOF
-#define XP_UNIX 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define hpux 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HPUX 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HPUX11 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HPUX11_11 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define CPU_hppa
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define OS_hpux 1
-_ACEOF
-
-    platform="hpux"
-    ;;
-  sparc-sun-solaris*)
-
-cat >>confdefs.h <<\_ACEOF
-#define XP_UNIX 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define SVR4 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define __svr4 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define __svr4__ 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define _SVID_GETTOD 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define SOLARIS 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define CPU_sparc
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define OS_solaris 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define sunos5 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define OSVERSION 509
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define _REENTRANT 1
-_ACEOF
-
-    platform="solaris"
-    ;;
-  *)
-    platform=""
-    ;;
-esac
-
-
-
-if test "$platform" = "solaris"; then
-  SOLARIS_TRUE=
-  SOLARIS_FALSE='#'
-else
-  SOLARIS_TRUE='#'
-  SOLARIS_FALSE=
-fi
-
-
 
 cat >>confdefs.h <<\_ACEOF
 #define LDAP_DEBUG 1
@@ -25566,6 +25569,20 @@
 s, at LIBTOOL@,$LIBTOOL,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
 s, at debug_defs@,$debug_defs,;t t
+s, at configdir@,$configdir,;t t
+s, at sampledatadir@,$sampledatadir,;t t
+s, at propertydir@,$propertydir,;t t
+s, at schemadir@,$schemadir,;t t
+s, at serverdir@,$serverdir,;t t
+s, at serverplugindir@,$serverplugindir,;t t
+s, at scripttemplatedir@,$scripttemplatedir,;t t
+s, at WINNT_TRUE@,$WINNT_TRUE,;t t
+s, at WINNT_FALSE@,$WINNT_FALSE,;t t
+s, at LIBSOCKET@,$LIBSOCKET,;t t
+s, at LIBNSL@,$LIBNSL,;t t
+s, at LIBDL@,$LIBDL,;t t
+s, at SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
+s, at SOLARIS_FALSE@,$SOLARIS_FALSE,;t t
 s, at PKG_CONFIG@,$PKG_CONFIG,;t t
 s, at ICU_CONFIG@,$ICU_CONFIG,;t t
 s, at NETSNMP_CONFIG@,$NETSNMP_CONFIG,;t t
@@ -25597,17 +25614,6 @@
 s, at netsnmp_lib@,$netsnmp_lib,;t t
 s, at netsnmp_libdir@,$netsnmp_libdir,;t t
 s, at netsnmp_link@,$netsnmp_link,;t t
-s, at configdir@,$configdir,;t t
-s, at sampledatadir@,$sampledatadir,;t t
-s, at propertydir@,$propertydir,;t t
-s, at schemadir@,$schemadir,;t t
-s, at serverdir@,$serverdir,;t t
-s, at serverplugindir@,$serverplugindir,;t t
-s, at scripttemplatedir@,$scripttemplatedir,;t t
-s, at WINNT_TRUE@,$WINNT_TRUE,;t t
-s, at WINNT_FALSE@,$WINNT_FALSE,;t t
-s, at SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
-s, at SOLARIS_FALSE@,$SOLARIS_FALSE,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- configure.ac	2 Feb 2007 20:27:29 -0000	1.14
+++ configure.ac	6 Feb 2007 15:51:22 -0000	1.15
@@ -61,47 +61,6 @@
 
 AC_PREFIX_DEFAULT([/opt/fedora-ds])
 
-# Check for library dependencies
-m4_include(m4/nspr.m4)
-m4_include(m4/nss.m4)
-m4_include(m4/mozldap.m4)
-m4_include(m4/db.m4)
-m4_include(m4/sasl.m4)
-m4_include(m4/svrcore.m4)
-m4_include(m4/icu.m4)
-m4_include(m4/netsnmp.m4)
-m4_include(m4/fhs.m4)
-
-# write out paths for binary components
-AC_SUBST(nspr_inc)
-AC_SUBST(nspr_lib)
-AC_SUBST(nspr_libdir)
-AC_SUBST(nss_inc)
-AC_SUBST(nss_lib)
-AC_SUBST(nss_libdir)
-AC_SUBST(ldapsdk_inc)
-AC_SUBST(ldapsdk_lib)
-AC_SUBST(ldapsdk_libdir)
-AC_SUBST(ldapsdk_bindir)
-AC_SUBST(db_inc)
-AC_SUBST(db_incdir)
-AC_SUBST(db_lib)
-AC_SUBST(db_libdir)
-AC_SUBST(db_bindir)
-AC_SUBST(db_libver)
-AC_SUBST(sasl_inc)
-AC_SUBST(sasl_lib)
-AC_SUBST(sasl_libdir)
-AC_SUBST(svrcore_inc)
-AC_SUBST(svrcore_lib)
-AC_SUBST(icu_lib)
-AC_SUBST(icu_inc)
-AC_SUBST(icu_bin)
-AC_SUBST(netsnmp_inc)
-AC_SUBST(netsnmp_lib)
-AC_SUBST(netsnmp_libdir)
-AC_SUBST(netsnmp_link)
-
 # installation paths - by default, configure will just
 # use /usr as the prefix for everything, which means
 # /usr/etc and /usr/var.  FHS sez to use /etc and /var.
@@ -184,6 +143,12 @@
     AC_DEFINE([sunos5], [1], [SunOS5])
     AC_DEFINE([OSVERSION], [509], [OS version])
     AC_DEFINE([_REENTRANT], [1], [_REENTRANT])
+    LIBSOCKET=-lsocket
+    AC_SUBST([LIBSOCKET], [$LIBSOCKET])
+    LIBNSL=-lnsl
+    AC_SUBST([LIBNSL], [$LIBNSL])
+    LIBDL=-ldl
+    AC_SUBST([LIBDL], [$LIBDL])
     platform="solaris"
     ;;
   *)
@@ -193,6 +158,47 @@
 
 AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
 
+# Check for library dependencies
+m4_include(m4/nspr.m4)
+m4_include(m4/nss.m4)
+m4_include(m4/mozldap.m4)
+m4_include(m4/db.m4)
+m4_include(m4/sasl.m4)
+m4_include(m4/svrcore.m4)
+m4_include(m4/icu.m4)
+m4_include(m4/netsnmp.m4)
+m4_include(m4/fhs.m4)
+
+# write out paths for binary components
+AC_SUBST(nspr_inc)
+AC_SUBST(nspr_lib)
+AC_SUBST(nspr_libdir)
+AC_SUBST(nss_inc)
+AC_SUBST(nss_lib)
+AC_SUBST(nss_libdir)
+AC_SUBST(ldapsdk_inc)
+AC_SUBST(ldapsdk_lib)
+AC_SUBST(ldapsdk_libdir)
+AC_SUBST(ldapsdk_bindir)
+AC_SUBST(db_inc)
+AC_SUBST(db_incdir)
+AC_SUBST(db_lib)
+AC_SUBST(db_libdir)
+AC_SUBST(db_bindir)
+AC_SUBST(db_libver)
+AC_SUBST(sasl_inc)
+AC_SUBST(sasl_lib)
+AC_SUBST(sasl_libdir)
+AC_SUBST(svrcore_inc)
+AC_SUBST(svrcore_lib)
+AC_SUBST(icu_lib)
+AC_SUBST(icu_inc)
+AC_SUBST(icu_bin)
+AC_SUBST(netsnmp_inc)
+AC_SUBST(netsnmp_lib)
+AC_SUBST(netsnmp_libdir)
+AC_SUBST(netsnmp_link)
+
 AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag])
 AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
 


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ltmain.sh	26 Jan 2007 20:54:32 -0000	1.4
+++ ltmain.sh	6 Feb 2007 15:51:22 -0000	1.5
@@ -46,10 +46,16 @@
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -105,12 +111,14 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+         save_$lt_var=\$$lt_var
+         $lt_var=C
+         export $lt_var
+       fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +144,8 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -327,7 +337,17 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         extracted_serial=`expr $extracted_serial + 1`
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+    case $arg in
+    -all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1169,20 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+    -static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+    -static-libtool-libs)
+      if test -z "$pic_flag" && test -n "$link_static_flag"; then
+        dlopen_self=$dlopen_self_static
+      fi
+      prefer_static_libs=yes
+      ;;
+    esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1712,7 +1742,7 @@
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+         { { test "$prefer_static_libs" = no ||
+             test "$prefer_static_libs,$installed" = "built,yes"; } ||
+           test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3410,11 +3442,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+#      for path in $notinst_path; do
+#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+#      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3591,7 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4239,12 +4268,14 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4747,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4877,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5624,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +5969,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+               $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
+
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6837,11 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 



From fedora-directory-commits at redhat.com  Tue Feb  6 19:40:38 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Tue,  6 Feb 2007 14:40:38 -0500
Subject: [Fedora-directory-commits] coolkey/src/install pk11install.c, 1.2,
	1.3
Message-ID: <200702061940.l16JecPV020491@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/coolkey/src/install
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20409

Modified Files:
	pk11install.c 
Log Message:
Use proper Windows ifdef, (WIN32 vs. _WINDOWS), to allow compilation on Windows.



Index: pk11install.c
===================================================================
RCS file: /cvs/dirsec/coolkey/src/install/pk11install.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pk11install.c	18 Jan 2007 01:05:07 -0000	1.2
+++ pk11install.c	6 Feb 2007 19:40:36 -0000	1.3
@@ -25,7 +25,7 @@
 /*
  * windows specific globing search
  */
-#ifdef _WINDOWS
+#ifdef WIN32 
 #include <windows.h>
 #include <winver.h>
 #include <winreg.h>
@@ -138,7 +138,7 @@
 } DirList;
 
 DirList dirList[] = {
-#ifdef _WINDOWS
+#ifdef WIN32 
     { AppDataDir, "Mozilla\\Profiles\\*", "*.slt" },
     { AppDataDir, "Mozilla\\Firefox\\Profiles\\*", NULL },
     { AppDataDir, "Thunderbird\\Profiles\\*", NULL },
@@ -309,7 +309,7 @@
     int i;
     InstType type = Install;
     char * path = NULL;
-#ifdef _WINDOWS
+#ifdef WIN32
     BOOL brc;
     HKEY regKey;
     unsigned long lrc;
@@ -363,7 +363,7 @@
 	return 0;
     }
 
-#ifdef _WINDOWS
+#ifdef WIN32 
     /* App Data Dir */
     brc = SHGetSpecialFolderPath(NULL, appData, CSIDL_APPDATA, FALSE);
     if (brc) {



From fedora-directory-commits at redhat.com  Tue Feb  6 19:47:32 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Tue,  6 Feb 2007 14:47:32 -0500
Subject: [Fedora-directory-commits] coolkey configure.in,1.8,1.9
Message-ID: <200702061947.l16JlWG5020765@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20612

Modified Files:
	configure.in 
Log Message:
Remove defaults for Windows only variables ZLIB_CFLAGS and ZLIB_LIBS.  Previously any attempt to override the variables in the ./configure call failed when attempting to build on Windows.



Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.in	18 Jan 2007 00:59:11 -0000	1.8
+++ configure.in	6 Feb 2007 19:47:30 -0000	1.9
@@ -54,8 +54,8 @@
 *-*-win*|*-*-cygwin*)
   	AC_MSG_RESULT([Windows])
 	WINDOWS=1
-	ZLIB_CFLAGS=-Ic:/zlib
-	ZLIB_LIBS=c:/zlib/zlib.dll
+	#ZLIB_CFLAGS=-Ic:/zlib
+	#ZLIB_LIBS=c:/zlib/zlib.dll
 	#OS_FLAGS=`echo $INCLUDE | tr '[[:upper:]]' '[[:lower:]]' | sed -e 's;\\\\;/;g' -e 's;.:;/cygdrive/&/;g' -e 's;:;;g' -e 's;//;/;g' -e 's/;/\" -I\"/g' -e 's;^;-I\";' -e 's;$;\";'`
 	CPPFLAGS="$CPPFLAGS $OS_FLAGS -DWIN32"
 	LDFLAGS="$LDFLAGS"



From fedora-directory-commits at redhat.com  Tue Feb  6 21:43:49 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Tue,  6 Feb 2007 16:43:49 -0500
Subject: [Fedora-directory-commits] esc/coreconf WIN32.mk,1.1,1.2
Message-ID: <200702062143.l16Lhn5I029072@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/coreconf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29055

Modified Files:
	WIN32.mk 
Log Message:
Cleanup.



Index: WIN32.mk
===================================================================
RCS file: /cvs/dirsec/esc/coreconf/WIN32.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WIN32.mk	2 Feb 2007 22:05:29 -0000	1.1
+++ WIN32.mk	6 Feb 2007 21:43:47 -0000	1.2
@@ -170,10 +170,10 @@
 	ifdef USE_SHIPS
 	    RELEASE_TREE = $(NTBUILD_SHIP)
 	else
-	    RELEASE_TREE = http://tsunami.dsdev.sjc.redhat.com/share/builds/components
+	    RELEASE_TREE = 
 	endif
     else
-	RELEASE_TREE = http://tsunami.dsdev.sjc.redhat.com/share/builds/components
+	RELEASE_TREE =
     endif
 endif
 



From fedora-directory-commits at redhat.com  Tue Feb  6 21:44:11 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue,  6 Feb 2007 16:44:11 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
	template-start-slapd.in, 1.4, 1.5 template-stop-slapd.in, 1.4, 1.5
Message-ID: <200702062144.l16LiB2c029100@cvs-int.fedora.redhat.com>

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29044

Modified Files:
	template-start-slapd.in template-stop-slapd.in 
Log Message:
Force to commit template-start-slapd.in and template-stop-slapd.in to make them younger than template-start-slapd and template-stop-slapd.








From fedora-directory-commits at redhat.com  Wed Feb  7 23:26:26 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed,  7 Feb 2007 18:26:26 -0500
Subject: [Fedora-directory-commits] 
	ldapserver/m4 db.m4, 1.5, 1.6 netsnmp.m4,
	1.2, 1.3 svrcore.m4, 1.3, 1.4
Message-ID: <200702072326.l17NQQrb015774@cvs-int.fedora.redhat.com>

Author: nkinder

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

Modified Files:
	db.m4 netsnmp.m4 svrcore.m4 
Log Message:
Resolves: 227754
Summary: Set library search path when using AC_CHECK_LIB in db.m4.



Index: db.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- db.m4	6 Feb 2007 15:51:22 -0000	1.5
+++ db.m4	7 Feb 2007 23:26:19 -0000	1.6
@@ -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,7 +73,10 @@
 db_libver=${db_ver_maj}.${db_ver_min}
 dnl make sure the lib is available
 dnl use true so libdb won't be added to LIBS
+save_ldflags="$LDFLAGS"
+LDFLAGS="$db_lib"
 AC_CHECK_LIB([db-$db_libver], [db_create], [true],
   [AC_MSG_ERROR([$db_incdir/db.h is version $db_libver but libdb-$db_libver not found])],
   [$LIBNSL])
+LDFLAGS="$save_ldflags"
 


Index: netsnmp.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/netsnmp.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netsnmp.m4	24 Oct 2006 21:11:02 -0000	1.2
+++ netsnmp.m4	7 Feb 2007 23:26:19 -0000	1.3
@@ -87,7 +87,6 @@
 
 dnl -  find dependent libs with net-snmp-config
 if test -n "$netsnmp_inc"; then
-  AC_MSG_CHECKING(for netsnmp libs with net-snmp-config)
   if test -x "$NETSNMPDIR/bin/net-snmp-config"; then
     NETSNMP_CONFIG=$NETSNMPDIR/bin/net-snmp-config
   else


Index: svrcore.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/svrcore.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- svrcore.m4	12 Jan 2007 16:18:15 -0000	1.3
+++ svrcore.m4	7 Feb 2007 23:26:19 -0000	1.4
@@ -1,6 +1,26 @@
-# -*- tab-width: 4; -*-
+# 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
+#
 # Configure paths for SVRCORE
-# Public domain - Nathan Kinder <nkinder at redhat.com> 2006-06-26
+
+AC_CHECKING(for svrcore)
 
 AC_MSG_CHECKING(for --with-svrcore)
 AC_ARG_WITH(svrcore,
@@ -65,8 +85,8 @@
 
 dnl svrcore not given - look for pkg-config
 if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
-  AC_MSG_CHECKING(for svrcore with pkg-config)
   AC_PATH_PROG(PKG_CONFIG, pkg-config)
+  AC_MSG_CHECKING(for svrcore with pkg-config)
   if test -n "$PKG_CONFIG"; then
     if $PKG_CONFIG --exists svrcore; then
       svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore`



From fedora-directory-commits at redhat.com  Wed Feb  7 23:26:21 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed,  7 Feb 2007 18:26:21 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.in, 1.22,
	1.23 aclocal.m4, 1.12, 1.13 compile, 1.7, 1.8 config.guess,
	1.6, 1.7 config.sub, 1.6, 1.7 configure, 1.21, 1.22 depcomp,
	1.7, 1.8 install-sh, 1.7, 1.8 ltmain.sh, 1.5, 1.6 missing, 1.7, 1.8
Message-ID: <200702072326.l17NQprk015777@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726

Modified Files:
	Makefile.in aclocal.m4 compile config.guess config.sub 
	configure depcomp install-sh ltmain.sh missing 
Log Message:
Resolves: 227754
Summary: Set library search path when using AC_CHECK_LIB in db.m4.



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.22 -r 1.23 Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.in	6 Feb 2007 15:51:22 -0000	1.22
+++ Makefile.in	7 Feb 2007 23:26:19 -0000	1.23
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,8 @@
 
 
 
+SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES!
 ) $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -685,19 +687,19 @@
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \
 	$(libacl_plugin_la_SOURCES) \
@@ -826,7 +828,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -5046,2286 +5047,2286 @@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi`
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo: ldap/servers/plugins/acl/acl_ext.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl_ext.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo: ldap/servers/plugins/acl/aclanom.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclanom.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo: ldap/servers/plugins/acl/acleffectiverights.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acleffectiverights.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo: ldap/servers/plugins/acl/aclgroup.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclgroup.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo: ldap/servers/plugins/acl/aclinit.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclinit.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo: ldap/servers/plugins/acl/acllas.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acllas.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo: ldap/servers/plugins/acl/acllist.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acllist.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo: ldap/servers/plugins/acl/aclparse.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclparse.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo: ldap/servers/plugins/acl/aclplugin.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclplugin.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo: ldap/servers/plugins/acl/aclproxy.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclproxy.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo: ldap/servers/plugins/acl/aclutil.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclutil.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c
 
 ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo: ldap/servers/plugins/uiduniq/7bit.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/uiduniq/7bit.c' object='ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c
 
 ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo: ldap/servers/plugins/uiduniq/uid.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/uiduniq/uid.c' object='ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c
 
 ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo: ldap/servers/plugins/shared/utils.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo -MD -MP -MF "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo" -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo -MD -MP -MF "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo" -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo" "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Plo"; else rm -f "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/shared/utils.c' object='ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c
 
 ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo: ldap/servers/slapd/back-ldbm/ancestorid.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libback_ldbm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo -MD -MP -MF "ldap/servers/slapd/back-ldbm/$(DEPDIR)/libback_ldbm_la-ancestorid.Tpo" -c -o ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo `test -f 'ldap/servers/slapd/back-ldbm/ancestorid.c' || echo '$(srcdir)/'`ldap/servers/slapd/back-ldbm/ancestorid.c; \
[...2964 lines suppressed...]
 lib/libaccess/libns_dshttpd_la-nseframe.lo: lib/libaccess/nseframe.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nseframe.cpp' object='lib/libaccess/libns_dshttpd_la-nseframe.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
 
 lib/libaccess/libns_dshttpd_la-nsautherr.lo: lib/libaccess/nsautherr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nsautherr.cpp' object='lib/libaccess/libns_dshttpd_la-nsautherr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
 
 lib/libaccess/libns_dshttpd_la-oneeval.lo: lib/libaccess/oneeval.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/oneeval.cpp' object='lib/libaccess/libns_dshttpd_la-oneeval.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
 
 lib/libaccess/libns_dshttpd_la-register.lo: lib/libaccess/register.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/register.cpp' object='lib/libaccess/libns_dshttpd_la-register.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
 
 lib/libaccess/libns_dshttpd_la-symbols.lo: lib/libaccess/symbols.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/symbols.cpp' object='lib/libaccess/libns_dshttpd_la-symbols.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
 
 lib/libaccess/libns_dshttpd_la-usi.lo: lib/libaccess/usi.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usi.cpp' object='lib/libaccess/libns_dshttpd_la-usi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
 
 lib/libaccess/libns_dshttpd_la-usrcache.lo: lib/libaccess/usrcache.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usrcache.cpp' object='lib/libaccess/libns_dshttpd_la-usrcache.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
 
 lib/base/libns_dshttpd_la-crit.lo: lib/base/crit.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/crit.cpp' object='lib/base/libns_dshttpd_la-crit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
 
 lib/base/libns_dshttpd_la-dns.lo: lib/base/dns.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dns.cpp' object='lib/base/libns_dshttpd_la-dns.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
 
 lib/base/libns_dshttpd_la-dnsdmain.lo: lib/base/dnsdmain.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dnsdmain.cpp' object='lib/base/libns_dshttpd_la-dnsdmain.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
 
 lib/base/libns_dshttpd_la-ereport.lo: lib/base/ereport.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/ereport.cpp' object='lib/base/libns_dshttpd_la-ereport.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
 
 lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
 
 lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
 
 lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
 
 lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
 
 lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
 
 lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
 
 lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
 
 lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
 
 lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
 
 lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
 
 lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.12 -r 1.13 aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aclocal.m4	6 Feb 2007 15:51:22 -0000	1.12
+++ aclocal.m4	7 Feb 2007 23:26:19 -0000	1.13
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 47 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +123,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
+Xsed='sed -e s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +143,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a `.a' archive for static linking (except M$VC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,7 +163,6 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -183,17 +182,15 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
-_LT_CC_BASENAME([$compiler])
-
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -234,56 +231,11 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
-
-
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -356,15 +308,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -533,7 +485,7 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -584,22 +536,6 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -631,7 +567,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -641,10 +577,8 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     # So say no if there are warnings
[...3358 lines suppressed...]
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -7032,16 +6694,27 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
+
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -7095,15 +6768,26 @@
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                     -*- Autoconf -*-
+# Helper functions for option handling.                    -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 
-# serial 3
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -7128,16 +6812,28 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
 #
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Check to make sure that the build environment is sane.
+#
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# 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, 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.
 
-# serial 4
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
 
 # AM_SANITY_CHECK
 # ---------------
@@ -7180,14 +6876,25 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # AM_PROG_INSTALL_STRIP
-# ---------------------
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -7210,13 +6917,25 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2004  Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
 
-# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------


Index: compile
===================================================================
RCS file: /cvs/dirsec/ldapserver/compile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- compile	2 Feb 2007 21:05:26 -0000	1.7
+++ compile	7 Feb 2007 23:26:19 -0000	1.8
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2005-05-14.22
+scriptversion=2004-09-10.20
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,11 +47,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit $?
+    exit 0
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit $?
+    exit 0
     ;;
 esac
 
@@ -125,8 +125,6 @@
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"


Index: config.guess
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.guess,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config.guess	6 Feb 2007 15:51:22 -0000	1.6
+++ config.guess	7 Feb 2007 23:26:19 -0000	1.7
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2004-09-07'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,15 +17,13 @@
 #
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Originally written by Per Bothner <per at bothner.com>.
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -55,7 +53,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -68,11 +66,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -125,7 +123,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi at noc.rutgers.edu 1994-08-24)
@@ -198,20 +196,55 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit ;;
+	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -264,43 +297,37 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit ;;
+	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit ;;
+	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit ;;
+	exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
+	exit 0 ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
+	exit 0 ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit ;;
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	exit 0;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -308,32 +335,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit ;;
+	exit 0 ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -342,10 +369,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
+	exit 0 ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -357,10 +384,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit ;;
+	exit 0 ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -371,40 +398,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit ;;
+	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -428,33 +455,32 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit ;;
+	exit 0 ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit ;;
+	exit 0 ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit ;;
+	exit 0 ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit ;;
+	exit 0 ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -470,29 +496,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+ 	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit ;;
+	exit 0 ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit ;;
+	exit 0 ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit ;;
+	exit 0 ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	exit 0 ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit ;;
+	exit 0 ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -500,7 +526,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -515,18 +541,14 @@
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	exit 0 ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -540,28 +562,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit ;;
+	exit 0 ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit ;;
+	exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit ;;
+	exit 0 ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit ;;
+	exit 0 ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit ;;
+	exit 0 ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit ;;
+	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -623,19 +645,9 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -643,11 +655,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -675,166 +687,158 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
-	exit ;;
+	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit ;;
+	exit 0 ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit ;;
+	exit 0 ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit ;;
+	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit ;;
+	exit 0 ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit ;;
+	exit 0 ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit ;;
+	exit 0 ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit ;;
+	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+        exit 0 ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
+	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
+	exit 0 ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	exit 0 ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
+	exit 0 ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
+	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
+	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit ;;
+	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
+	exit 0 ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
+	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit ;;
+	exit 0 ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit ;;
+	exit 0 ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -852,7 +856,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -871,14 +875,14 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -892,7 +896,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
+	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -900,25 +904,25 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit ;;
+	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
+	exit 0 ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -936,15 +940,15 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
+		exit 0 ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
+		exit 0 ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
+		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -972,18 +976,15 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit ;;
+	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -991,27 +992,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
+	exit 0 ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
+	exit 0 ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
+	exit 0 ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
+	exit 0 ;;
+	i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
+	exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1019,16 +1020,15 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	exit 0 ;;
+    i*86:*:5:[78]*)
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
+	exit 0 ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1046,73 +1046,73 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit ;;
+	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit ;;
+        exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit ;;
+	exit 0 ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit ;;
+	exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit ;;
+	exit 0 ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit ;;
+	exit 0 ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit ;;
+	exit 0 ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit ;;
+	exit 0 ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit ;;
+	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1120,65 +1120,61 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit ;;
+	exit 0 ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel at ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit ;;
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit ;;
+	exit 0 ;;
     *:*:*:FTX*)
 	# From seanf at swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green at stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	exit 0 ;;
     *:VOS:*:*)
 	# From Paul.Green at stratus.com.
 	echo hppa1.1-stratus-vos
-	exit ;;
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit ;;
+	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit ;;
+	exit 0 ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit ;;
+	exit 0 ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit ;;
+	exit 0 ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1186,7 +1182,7 @@
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1194,25 +1190,22 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit ;;
+	exit 0 ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit ;;
+	exit 0 ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1223,44 +1216,38 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
+	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit ;;
+	exit 0 ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit ;;
+	exit 0 ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit ;;
+	exit 0 ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit ;;
+	exit 0 ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit ;;
+	exit 0 ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit ;;
+	exit 0 ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
+	exit 0 ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
+	esac
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1292,7 +1279,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1381,12 +1368,11 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1395,22 +1381,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit ;;
+	exit 0 ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     c34*)
 	echo c34-convex-bsd
-	exit ;;
+	exit 0 ;;
     c38*)
 	echo c38-convex-bsd
-	exit ;;
+	exit 0 ;;
     c4*)
 	echo c4-convex-bsd
-	exit ;;
+	exit 0 ;;
     esac
 fi
 
@@ -1421,9 +1407,7 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+    ftp://ftp.gnu.org/pub/gnu/config/
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be


Index: config.sub
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.sub,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config.sub	6 Feb 2007 15:51:22 -0000	1.6
+++ config.sub	7 Feb 2007 23:26:19 -0000	1.7
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2004-08-29'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,15 +21,14 @@
 #
 # 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.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -71,7 +70,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -84,11 +83,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -100,7 +99,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
        break ;;
@@ -232,14 +231,13 @@
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -248,7 +246,6 @@
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -257,28 +254,23 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| or32 \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -306,7 +298,7 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bfin-* | bs2000-* \
+	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -318,7 +310,7 @@
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -327,7 +319,6 @@
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -336,7 +327,6 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -344,23 +334,20 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -502,10 +489,6 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -771,8 +754,9 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	openrisc | openrisc-*)
+	or32 | or32-*)
 		basic_machine=or32-unknown
+		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1045,10 +1029,6 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1098,9 +1078,12 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1187,8 +1170,7 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1206,7 +1188,7 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1315,9 +1297,6 @@
 	-kaos*)
 		os=-kaos
 		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
 	-none)
 		;;
 	*)
@@ -1395,9 +1374,6 @@
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1569,7 +1545,7 @@
 esac
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.21 -r 1.22 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure	6 Feb 2007 15:51:22 -0000	1.21
+++ configure	7 Feb 2007 23:26:19 -0000	1.22
@@ -280,15 +280,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/fedora-ds
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
 XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3819,13 +3819,12 @@
     done
   done
 done
-IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
+  test ! -f $lt_ac_sed && break
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -3850,11 +3849,10 @@
     fi
   done
 done
+SED=$lt_cv_path_SED
 
 fi
 
-SED=$lt_cv_path_SED
-
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -3931,7 +3929,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
+      # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -3965,7 +3963,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -3995,15 +3993,6 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -4014,43 +4003,36 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      # Check to see if the nm accepts a BSD-compat flag.
+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      # Tru64's nm complains that /dev/null is an invalid object file
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
+	lt_cv_path_NM="$tmp_nm -B"
+	break
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
 	  break
 	  ;;
 	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
 	  ;;
 	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
+      esac
+    fi
   done
+  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -4097,7 +4079,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi[45]*)
+bsdi4*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
@@ -4120,13 +4102,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | kfreebsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -4142,7 +4124,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
+  case "$host_cpu" in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
[...14248 lines suppressed...]
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 compiler_RC=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
 lt_cv_prog_compiler_c_o_RC=yes
 
 # The else clause should only fire when bootstrapping the
@@ -18305,7 +18838,7 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18406,12 +18939,6 @@
 # The host system.
 host_alias=$host_alias
 host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -18423,18 +18950,12 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
 # A language-specific compiler.
 CC=$lt_compiler_RC
 
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18494,7 +19015,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 
-# Must we lock files when doing compilation?
+# Must we lock files when doing compilation ?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -18568,11 +19089,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18584,7 +19105,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18664,7 +19185,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23701,7 +24222,7 @@
 fi
 
 # 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
@@ -23787,6 +24308,8 @@
 db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h | awk '{print $3}'`
 db_ver_pat=`grep DB_VERSION_PATCH $db_incdir/db.h | awk '{print $3}'`
 db_libver=${db_ver_maj}.${db_ver_min}
+save_ldflags="$LDFLAGS"
+LDFLAGS="$db_lib"
 as_ac_Lib=`echo "ac_cv_lib_db-$db_libver''_db_create" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for db_create in -ldb-$db_libver" >&5
 echo $ECHO_N "checking for db_create in -ldb-$db_libver... $ECHO_C" >&6
@@ -23860,6 +24383,7 @@
    { (exit 1); exit 1; }; }
 fi
 
+LDFLAGS="$save_ldflags"
 
 
 # BEGIN COPYRIGHT BLOCK
@@ -24004,9 +24528,30 @@
   fi
 fi
 
-# -*- tab-width: 4; -*-
+# 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
+#
 # Configure paths for SVRCORE
-# Public domain - Nathan Kinder <nkinder at redhat.com> 2006-06-26
+
+{ echo "$as_me:$LINENO: checking for svrcore..." >&5
+echo "$as_me: checking for svrcore..." >&6;}
 
 echo "$as_me:$LINENO: checking for --with-svrcore" >&5
 echo $ECHO_N "checking for --with-svrcore... $ECHO_C" >&6
@@ -24100,8 +24645,6 @@
 fi;
 
 if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
-  echo "$as_me:$LINENO: checking for svrcore with pkg-config" >&5
-echo $ECHO_N "checking for svrcore with pkg-config... $ECHO_C" >&6
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -24141,6 +24684,8 @@
 echo "${ECHO_T}no" >&6
 fi
 
+  echo "$as_me:$LINENO: checking for svrcore with pkg-config" >&5
+echo $ECHO_N "checking for svrcore with pkg-config... $ECHO_C" >&6
   if test -n "$PKG_CONFIG"; then
     if $PKG_CONFIG --exists svrcore; then
       svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore`
@@ -24682,8 +25227,6 @@
 fi
 
 if test -n "$netsnmp_inc"; then
-  echo "$as_me:$LINENO: checking for netsnmp libs with net-snmp-config" >&5
-echo $ECHO_N "checking for netsnmp libs with net-snmp-config... $ECHO_C" >&6
   if test -x "$NETSNMPDIR/bin/net-snmp-config"; then
     NETSNMP_CONFIG=$NETSNMPDIR/bin/net-snmp-config
   else
@@ -25553,7 +26096,6 @@
 s, at CCDEPMODE@,$CCDEPMODE,;t t
 s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at SED@,$SED,;t t
 s, at EGREP@,$EGREP,;t t
 s, at LN_S@,$LN_S,;t t
 s, at ECHO@,$ECHO,;t t


Index: depcomp
===================================================================
RCS file: /cvs/dirsec/ldapserver/depcomp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- depcomp	2 Feb 2007 21:05:26 -0000	1.7
+++ depcomp	7 Feb 2007 23:26:19 -0000	1.8
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2004-05-31.23
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
 # 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
@@ -17,8 +17,8 @@
 
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -50,11 +50,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit $?
+    exit 0
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit $?
+    exit 0
     ;;
 esac
 
@@ -287,43 +287,36 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      # Dependencies are output in .lo.d with libtool 1.4.
+      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
+      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
+      # latter, because the former will be cleaned when $dir.libs is
+      # erased.
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir$base.o.d"
+      tmpdepfile3="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      tmpdepfile3="$dir$base.d"
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
       exit $stat
    fi
 
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   elif test -f "$tmpdepfile2"; then
+      tmpdepfile="$tmpdepfile2"
+   else
+      tmpdepfile="$tmpdepfile3"
+   fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -467,8 +460,7 @@
   done
 
   "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"


Index: install-sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/install-sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- install-sh	2 Feb 2007 21:05:26 -0000	1.7
+++ install-sh	7 Feb 2007 23:26:19 -0000	1.8
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2004-09-10.20
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -109,7 +109,7 @@
         shift
         continue;;
 
-    --help) echo "$usage"; exit $?;;
+    --help) echo "$usage"; exit 0;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -134,7 +134,7 @@
 	shift
 	continue;;
 
-    --version) echo "$0 $scriptversion"; exit $?;;
+    --version) echo "$0 $scriptversion"; exit 0;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.
@@ -213,7 +213,7 @@
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -226,8 +226,7 @@
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
     IFS=$oIFS
 
     pathcomp=
@@ -296,7 +295,7 @@
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
+		 (exit 1); exit
 	       }
 	     else
 	       :
@@ -307,12 +306,12 @@
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
     }
-  fi || { (exit 1); exit 1; }
+  fi || { (exit 1); exit; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit 0
+  (exit 0); exit
 }
 
 # Local variables:


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ltmain.sh	6 Feb 2007 15:51:22 -0000	1.5
+++ ltmain.sh	7 Feb 2007 23:26:19 -0000	1.6
@@ -46,16 +46,10 @@
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" ; then
   setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -111,14 +105,12 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-         save_$lt_var=\$$lt_var
-         $lt_var=C
-         export $lt_var
-       fi"
-done
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -144,8 +136,6 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -337,17 +327,7 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-       *" $my_xlib_u "*)
-         extracted_serial=`expr $extracted_serial + 1`
-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
-       *) break ;;
-       esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -778,7 +758,6 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
-    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1159,9 +1138,8 @@
     for arg
     do
       case $arg in
-      -all-static | -static | -static-libtool-libs)
-    case $arg in
-    -all-static)
+      -all-static | -static)
+	if test "X$arg" = "X-all-static"; then
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1169,20 +1147,12 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	  ;;
-    -static)
+	else
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	  ;;
-    -static-libtool-libs)
-      if test -z "$pic_flag" && test -n "$link_static_flag"; then
-        dlopen_self=$dlopen_self_static
-      fi
-      prefer_static_libs=yes
-      ;;
-    esac
+	fi
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1742,7 +1712,7 @@
 	continue
 	;;
 
-      -static | -static-libtool-libs)
+      -static)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2520,9 +2490,7 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-         { { test "$prefer_static_libs" = no ||
-             test "$prefer_static_libs,$installed" = "built,yes"; } ||
-           test -z "$old_library"; }; then
+	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3218,7 +3186,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows|none)
+	  darwin|linux|osf|windows)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3442,11 +3410,11 @@
       fi
 
       # Eliminate all temporary directories.
-#      for path in $notinst_path; do
-#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-#      done
+      for path in $notinst_path; do
+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3547,12 +3515,13 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+	  if test "$?" -eq 0 ; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
+              if test "$name" != "" && test "$name" -ne "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3591,7 +3560,9 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		$LTCC $LTCFLAGS -o conftest conftest.c $i
+		# Did it work?
+		if test "$?" -eq 0 ; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3623,7 +3594,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
+		  $echo "***  make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4268,14 +4239,12 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
+      # -Wl from whole_archive_flag_spec
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4723,16 +4692,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
             else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
             ;;
           esac
 	  ;;
@@ -4747,13 +4716,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4840,7 +4809,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4877,7 +4846,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi
 
       # Quote $echo for shipping.
@@ -5284,18 +5253,6 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5438,7 +5395,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5624,7 +5581,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5969,9 +5926,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6180,7 +6137,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6456,15 +6413,12 @@
       fi
 
       # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-       eval "if test \"\${save_$lt_var+set}\" = set; then
-               $lt_var=\$save_$lt_var; export $lt_var
-             else
-               $lt_unset $lt_var
-             fi"
-      done
-
+      if test "${save_LC_ALL+set}" = set; then
+	LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+	LANG="$save_LANG"; export LANG
+      fi
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6821,9 +6775,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
+		    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
+		    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6837,11 +6791,9 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
+		    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 


Index: missing
===================================================================
RCS file: /cvs/dirsec/ldapserver/missing,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- missing	2 Feb 2007 21:05:26 -0000	1.7
+++ missing	7 Feb 2007 23:26:19 -0000	1.8
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2004-09-07.08
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
@@ -19,8 +19,8 @@
 
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake at gnu.org>."
-    exit $?
+    exit 0
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
-    exit $?
+    exit 0
     ;;
 
   -*)
@@ -288,18 +288,11 @@
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
     touch $file
     ;;
 



From fedora-directory-commits at redhat.com  Wed Feb  7 23:57:47 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed,  7 Feb 2007 18:57:47 -0500
Subject: [Fedora-directory-commits] ldapserver/wrappers dbscan.in, 1.2,
	1.3 ds_newinst.in, 1.3, 1.4 dsktune.in, 1.2, 1.3 ldap-agent.in,
	1.2, 1.3 ldif.in, 1.2, 1.3 migratecred.in, 1.2, 1.3 mmldif.in,
	1.2, 1.3 pwdhash.in, 1.2, 1.3
Message-ID: <200702072357.l17NvlrT016105@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15984/ldapserver/wrappers

Modified Files:
	dbscan.in ds_newinst.in dsktune.in ldap-agent.in ldif.in 
	migratecred.in mmldif.in pwdhash.in 
Log Message:
esolves: bug 227618
Bug Description: FHS: move exes to _bindir; move ns-slapd to _sbindir
Reviewed by: many people (Thanks!)
Fix Description: In order to be more FHS compliant, we need to make the following changes:
1) move files executable by end users to _bindir (e.g. /usr/bin) - this means logconv.pl, ds_newinst, dbscan, etc.
2) move the server executable ns-slapd to _sbindir (e.g. /usr/sbin)
And, to be more packaging friendly, the additional changes:
3) move libback-ldbm to the plugins dir - it is a plugin
4) use the libtool -avoid-version flag with plugins - we don't need the .so.0.0.0 for plugins
I had to add support for sbindir and SBINDIR to create_instance and ds_newinst.  We were using serverdir for 3 things - command line programs, server specific shared libs, and the server executable itself.  These are now in 3 different places.  The biggest change was to the scripts.  I kept serverdir and SERVER-DIR to be the location of the server shared libs to avoid changing even more stuff.  I had to add SERVERBIN-DIR to the scripts - this is the location of ns-slapd and is set by sbindir in create_instance (which defaults to SBINDIR from Makefile.am which defaults to $prefix/sbin in configure - whew).
I've tested instance creation with these diffs - everything seems to work fine.
5) reorder files in alphabetical order - suggested by nkinder
6) add $LDFLAGS to test in db.m4
7) touch all template/wrapper .in files to make them newer than their corresponding files
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes, but the docs will have to change quite a bit for all of the FHS related changes. 



Index: dbscan.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/dbscan.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dbscan.in	2 Nov 2006 03:11:40 -0000	1.2
+++ dbscan.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nspr_libdir@:@db_libdir@
-BIN_DIR=@serverdir@
+BIN_DIR=@bindir@
 COMMAND=dbscan-bin
 
 


Index: ds_newinst.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/ds_newinst.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ds_newinst.in	29 Jan 2007 18:48:11 -0000	1.3
+++ ds_newinst.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -4,8 +4,8 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@serverdir@:@libdir@
-BIN_DIR=@serverdir@:@bindir@:/usr/bin:/bin
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@libdir@
+BIN_DIR=@bindir@:/usr/bin:/bin
 COMMAND=ds_newinst-bin
 
 


Index: dsktune.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/dsktune.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsktune.in	2 Nov 2006 03:11:40 -0000	1.2
+++ dsktune.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=
-BIN_DIR=@serverdir@
+BIN_DIR=@bindir@
 COMMAND=dsktune-bin
 
 


Index: ldap-agent.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/ldap-agent.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ldap-agent.in	2 Nov 2006 03:11:40 -0000	1.2
+++ ldap-agent.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@netsnmp_libdir@
-BIN_DIR=@serverdir@
+BIN_DIR=@bindir@
 COMMAND=ldap-agent-bin
 
 


Index: ldif.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/ldif.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ldif.in	2 Nov 2006 03:11:40 -0000	1.2
+++ ldif.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@serverdir@
+BIN_DIR=@bindir@
 COMMAND=ldif-bin
 
 


Index: migratecred.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/migratecred.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- migratecred.in	2 Nov 2006 03:11:40 -0000	1.2
+++ migratecred.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -4,8 +4,8 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@serverdir@
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
+BIN_DIR=@bindir@
 COMMAND=migratecred-bin
 
 


Index: mmldif.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/mmldif.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mmldif.in	2 Nov 2006 03:11:40 -0000	1.2
+++ mmldif.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -4,8 +4,8 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@serverdir@
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
+BIN_DIR=@bindir@
 COMMAND=mmldif-bin
 
 


Index: pwdhash.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/pwdhash.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pwdhash.in	2 Nov 2006 03:11:40 -0000	1.2
+++ pwdhash.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -4,8 +4,8 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@serverdir@
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
+BIN_DIR=@bindir@
 COMMAND=pwdhash-bin
 
 



From fedora-directory-commits at redhat.com  Wed Feb  7 23:57:36 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed,  7 Feb 2007 18:57:36 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.20,
	1.21 Makefile.in, 1.23, 1.24 aclocal.m4, 1.13, 1.14 configure,
	1.22, 1.23 missing, 1.8, 1.9 install-sh, 1.8, 1.9 depcomp, 1.8,
	1.9 compile, 1.8, 1.9 config.sub, 1.7, 1.8 config.guess, 1.7, 1.8
Message-ID: <200702072358.l17Nw6aK016111@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15984/ldapserver

Modified Files:
	Makefile.am Makefile.in aclocal.m4 configure missing 
	install-sh depcomp compile config.sub config.guess 
Log Message:
esolves: bug 227618
Bug Description: FHS: move exes to _bindir; move ns-slapd to _sbindir
Reviewed by: many people (Thanks!)
Fix Description: In order to be more FHS compliant, we need to make the following changes:
1) move files executable by end users to _bindir (e.g. /usr/bin) - this means logconv.pl, ds_newinst, dbscan, etc.
2) move the server executable ns-slapd to _sbindir (e.g. /usr/sbin)
And, to be more packaging friendly, the additional changes:
3) move libback-ldbm to the plugins dir - it is a plugin
4) use the libtool -avoid-version flag with plugins - we don't need the .so.0.0.0 for plugins
I had to add support for sbindir and SBINDIR to create_instance and ds_newinst.  We were using serverdir for 3 things - command line programs, server specific shared libs, and the server executable itself.  These are now in 3 different places.  The biggest change was to the scripts.  I kept serverdir and SERVER-DIR to be the location of the server shared libs to avoid changing even more stuff.  I had to add SERVERBIN-DIR to the scripts - this is the location of ns-slapd and is set by sbindir in create_instance (which defaults to SBINDIR from Makefile.am which defaults to $prefix/sbin in configure - whew).
I've tested instance creation with these diffs - everything seems to work fine.
5) reorder files in alphabetical order - suggested by nkinder
6) add $LDFLAGS to test in db.m4
7) touch all template/wrapper .in files to make them newer than their corresponding files
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes, but the docs will have to change quite a bit for all of the FHS related changes. 



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.am	6 Feb 2007 15:51:22 -0000	1.20
+++ Makefile.am	7 Feb 2007 23:57:34 -0000	1.21
@@ -20,7 +20,9 @@
 # which would be an error
 PATH_DEFINES = -DLOCALSTATEDIR="\"$(localstatedir)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" \
 	-DLIBDIR="\"$(libdir)\"" -DBINDIR="\"$(bindir)\"" \
-	-DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\""
+	-DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\"" \
+	-DSBINDIR="\"$(sbindir)\""
+
 AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
 PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
 
@@ -68,20 +70,20 @@
 #------------------------
 # Build Products
 #------------------------
-server_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin ldap-agent-bin ldif-bin \
-	migratecred-bin mmldif-bin ns-slapd pwdhash-bin
+sbin_PROGRAMS = ns-slapd
 
-bin_PROGRAMS = infadd-bin ldclt-bin rsearch-bin
+bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \
+	ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin
 
-server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la
+server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
 
-serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \
-	libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \
-	libhttp-client-plugin.la libcollation-plugin.la libpam-passthru-plugin.la \
-	libpassthru-plugin.la libpresence-plugin.la libpwdstorage-plugin.la \
-	libreferint-plugin.la libreplication-plugin.la libretrocl-plugin.la \
-	libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \
-	libviews-plugin.la libdna-plugin.la
+serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \
+	libback-ldbm.la libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la \
+	libdistrib-plugin.la libdna-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
+	libpam-passthru-plugin.la libpassthru-plugin.la libpresence-plugin.la \
+	libpwdstorage-plugin.la libreferint-plugin.la libreplication-plugin.la \
+	libretrocl-plugin.la libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \
+	libviews-plugin.la
 
 nodist_property_DATA = ns-slapd.properties
 
@@ -127,20 +129,19 @@
 	$(srcdir)/ldap/schema/99user.ldif
 
 bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
-	wrappers/infadd \
-	wrappers/ldclt \
-	wrappers/rsearch
-
-server_SCRIPTS = wrappers/dbscan \
-	wrappers/dsktune \
+	wrappers/dbscan \
 	wrappers/ds_newinst \
+	$(srcdir)/ldap/admin/src/ds_newinst.pl \
+	wrappers/dsktune \
+	wrappers/infadd \
 	wrappers/ldap-agent \
+	wrappers/ldclt \
 	wrappers/ldif \
+	$(srcdir)/ldap/admin/src/logconv.pl \
 	wrappers/migratecred \
 	wrappers/mmldif \
 	wrappers/pwdhash \
-	$(srcdir)/ldap/admin/src/logconv.pl \
-	$(srcdir)/ldap/admin/src/ds_newinst.pl
+	wrappers/rsearch
 
 task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
 	ldap/admin/src/scripts/template-db2bak \
@@ -401,7 +402,7 @@
 
 #////////////////////////////////////////////////////////////////
 #
-#   Backend Plugins
+#   Plugins
 #
 #////////////////////////////////////////////////////////////////
 #------------------------
@@ -468,13 +469,8 @@
 
 libback_ldbm_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@
 libback_ldbm_la_LIBADD = libslapd.la $(DB_LINK)
+libback_ldbm_la_LDFLAGS = -avoid-version
 
-
-#////////////////////////////////////////////////////////////////
-#
-#   Plugins
-#
-#////////////////////////////////////////////////////////////////
 #------------------------
 # libacl-plugin
 #------------------------
@@ -493,6 +489,7 @@
 
 libacl_plugin_la_CPPFLAGS = -I$(srcdir)/include/libaccess $(PLUGIN_CPPFLAGS)
 libacl_plugin_la_LIBADD = libns-dshttpd.la
+libacl_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libattr-unique-plugin
@@ -502,6 +499,7 @@
 	ldap/servers/plugins/shared/utils.c
 
 libattr_unique_plugin_la_CPPFLAGS = -I$(srcdir)/ldap/servers/plugins/shared $(PLUGIN_CPPFLAGS)
+libattr_unique_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libchainingdb-plugin
@@ -533,6 +531,7 @@
 	ldap/servers/plugins/chainingdb/cb_utils.c 
 
 libchainingdb_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libchainingdb_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libcos-plugin
@@ -541,6 +540,7 @@
 	ldap/servers/plugins/cos/cos_cache.c
 
 libcos_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libcos_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libdes-plugin
@@ -549,6 +549,7 @@
 	ldap/servers/plugins/rever/rever.c
 
 libdes_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @svrcore_inc@
+libdes_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libdistrib-plugin
@@ -556,6 +557,7 @@
 libdistrib_plugin_la_SOURCES = ldap/servers/plugins/distrib/distrib.c
 
 libdistrib_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libdistrib_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libhttp-client-plugin
@@ -564,6 +566,7 @@
 	ldap/servers/plugins/http/http_impl.c
 
 libhttp_client_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libhttp_client_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libcollation-plugin
@@ -574,6 +577,7 @@
 
 libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
 libcollation_plugin_la_LIBADD = $(ICU_LINK)
+libcollation_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libpam-passthru-plugin
@@ -585,6 +589,7 @@
 
 libpam_passthru_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
 libpam_passthru_plugin_la_LIBADD = $(PAM_LINK)
+libpam_passthru_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libpassthru-plugin
@@ -597,6 +602,7 @@
 	ldap/servers/plugins/passthru/ptutil.c
 
 libpassthru_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libpassthru_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libpresence-plugin
@@ -604,6 +610,7 @@
 libpresence_plugin_la_SOURCES = ldap/servers/plugins/presence/presence.c
 
 libpresence_plugin_la_CPPFLAGS = -I$(srcdir)/ldap/servers/plugins/http $(PLUGIN_CPPFLAGS)
+libpresence_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libpwdstorage-plugin
@@ -618,6 +625,7 @@
 	ldap/servers/plugins/pwdstorage/ssha_pwd.c
 
 libpwdstorage_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libpwdstorage_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libreferint-plugin
@@ -625,6 +633,7 @@
 libreferint_plugin_la_SOURCES = ldap/servers/plugins/referint/referint.c
 
 libreferint_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libreferint_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libreplication-plugin
@@ -686,6 +695,7 @@
 
 libreplication_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ @db_inc@
 libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK)
+libreplication_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libretrocl-plugin
@@ -698,6 +708,7 @@
 	ldap/servers/plugins/retrocl/retrocl_trim.c
 
 libretrocl_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libretrocl_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libroles-plugin
@@ -706,6 +717,7 @@
 	ldap/servers/plugins/roles/roles_plugin.c
 
 libroles_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libroles_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libstatechange-plugin
@@ -713,6 +725,7 @@
 libstatechange_plugin_la_SOURCES = ldap/servers/plugins/statechange/statechange.c
 
 libstatechange_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libstatechange_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libsyntax-plugin
@@ -730,6 +743,7 @@
 	ldap/servers/plugins/syntaxes/value.c
 
 libsyntax_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libsyntax_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libviews-plugin
@@ -737,6 +751,7 @@
 libviews_plugin_la_SOURCES = ldap/servers/plugins/views/views.c
 
 libviews_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libviews_plugin_la_LDFLAGS = -avoid-version
 
 #------------------------
 # libdna-plugin
@@ -744,6 +759,7 @@
 libdna_plugin_la_SOURCES = ldap/servers/plugins/dna/dna.c
 
 libdna_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS)
+libdna_plugin_la_LDFLAGS = -avoid-version
 
 
 #////////////////////////////////////////////////////////////////
@@ -911,6 +927,7 @@
 # LD_LIBRARY_PATH = /usr/lib/fedora-ds
 fixupcmd = sed \
 	-e 's, at bindir\@,$(bindir),g' \
+	-e 's, at sbindir\@,$(sbindir),g' \
 	-e 's, at libdir\@,$(libdir),g' \
 	-e 's, at nspr_libdir\@,$(nspr_libdir),g' \
 	-e 's, at nss_libdir\@,$(nss_libdir),g' \


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.23 -r 1.24 Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.in	7 Feb 2007 23:26:19 -0000	1.23
+++ Makefile.in	7 Feb 2007 23:57:34 -0000	1.24
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +18,6 @@
 
 
 
-SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES!
 ) $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -42,12 +40,12 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-server_PROGRAMS = dbscan-bin$(EXEEXT) ds_newinst-bin$(EXEEXT) \
-	dsktune-bin$(EXEEXT) ldap-agent-bin$(EXEEXT) ldif-bin$(EXEEXT) \
-	migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) ns-slapd$(EXEEXT) \
-	pwdhash-bin$(EXEEXT)
-bin_PROGRAMS = infadd-bin$(EXEEXT) ldclt-bin$(EXEEXT) \
-	rsearch-bin$(EXEEXT)
+sbin_PROGRAMS = ns-slapd$(EXEEXT)
+bin_PROGRAMS = dbscan-bin$(EXEEXT) ds_newinst-bin$(EXEEXT) \
+	dsktune-bin$(EXEEXT) infadd-bin$(EXEEXT) \
+	ldap-agent-bin$(EXEEXT) ldclt-bin$(EXEEXT) ldif-bin$(EXEEXT) \
+	migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) \
+	pwdhash-bin$(EXEEXT) rsearch-bin$(EXEEXT)
 noinst_PROGRAMS = makstrdb$(EXEEXT)
 @SOLARIS_TRUE at am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -95,10 +93,10 @@
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(serverdir)" \
 	"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(serverdir)" "$(DESTDIR)$(taskdir)" \
-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
-	"$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"
+	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \
+	"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" \
+	"$(DESTDIR)$(schemadir)"
 serverLTLIBRARIES_INSTALL = $(INSTALL)
 serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
@@ -542,8 +540,8 @@
 	ldap/servers/plugins/views/libviews_plugin_la-views.lo
 libviews_plugin_la_OBJECTS = $(am_libviews_plugin_la_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-serverPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(server_PROGRAMS)
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
 am_dbscan_bin_OBJECTS =  \
 	ldap/servers/slapd/tools/dbscan_bin-dbscan.$(OBJEXT)
 dbscan_bin_OBJECTS = $(am_dbscan_bin_OBJECTS)
@@ -679,27 +677,26 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-serverSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 taskSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS) $(server_SCRIPTS) $(task_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(task_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \
 	$(libacl_plugin_la_SOURCES) \
@@ -828,6 +825,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -942,7 +940,8 @@
 # which would be an error
 PATH_DEFINES = -DLOCALSTATEDIR="\"$(localstatedir)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" \
 	-DLIBDIR="\"$(libdir)\"" -DBINDIR="\"$(bindir)\"" \
-	-DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\""
+	-DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\"" \
+	-DSBINDIR="\"$(sbindir)\""
 
 AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
 PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
@@ -966,14 +965,14 @@
 BUILT_SOURCES = dirver.h dberrstrs.h
 CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties
 taskdir = $(datadir)@scripttemplatedir@
-server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la
-serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \
-	libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \
-	libhttp-client-plugin.la libcollation-plugin.la libpam-passthru-plugin.la \
-	libpassthru-plugin.la libpresence-plugin.la libpwdstorage-plugin.la \
-	libreferint-plugin.la libreplication-plugin.la libretrocl-plugin.la \
-	libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \
-	libviews-plugin.la libdna-plugin.la
+server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
+serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \
+	libback-ldbm.la libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la \
+	libdistrib-plugin.la libdna-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
+	libpam-passthru-plugin.la libpassthru-plugin.la libpresence-plugin.la \
+	libpwdstorage-plugin.la libreferint-plugin.la libreplication-plugin.la \
+	libretrocl-plugin.la libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \
+	libviews-plugin.la
 
 nodist_property_DATA = ns-slapd.properties
 noinst_LIBRARIES = libavl.a libldaputil.a
@@ -1016,20 +1015,19 @@
 	$(srcdir)/ldap/schema/99user.ldif
 
 bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
-	wrappers/infadd \
-	wrappers/ldclt \
-	wrappers/rsearch
-
-server_SCRIPTS = wrappers/dbscan \
-	wrappers/dsktune \
+	wrappers/dbscan \
 	wrappers/ds_newinst \
+	$(srcdir)/ldap/admin/src/ds_newinst.pl \
+	wrappers/dsktune \
+	wrappers/infadd \
 	wrappers/ldap-agent \
+	wrappers/ldclt \
 	wrappers/ldif \
+	$(srcdir)/ldap/admin/src/logconv.pl \
 	wrappers/migratecred \
 	wrappers/mmldif \
 	wrappers/pwdhash \
-	$(srcdir)/ldap/admin/src/logconv.pl \
-	$(srcdir)/ldap/admin/src/ds_newinst.pl
+	wrappers/rsearch
 
 task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
 	ldap/admin/src/scripts/template-db2bak \
@@ -1281,7 +1279,7 @@
 
 #////////////////////////////////////////////////////////////////
 #
-#   Backend Plugins
+#   Plugins
 #
 #////////////////////////////////////////////////////////////////
 #------------------------
@@ -1348,12 +1346,8 @@
 
 libback_ldbm_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@
 libback_ldbm_la_LIBADD = libslapd.la $(DB_LINK)
+libback_ldbm_la_LDFLAGS = -avoid-version
 
-#////////////////////////////////////////////////////////////////
-#
-#   Plugins
-#
-#////////////////////////////////////////////////////////////////
 #------------------------
 # libacl-plugin
 #------------------------
@@ -1372,6 +1366,7 @@
 
[...3438 lines suppressed...]
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
 
 lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
 
 lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
 
 lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
 
 lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
 
 lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
 
 lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
 
 lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
 
 lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
 
 lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
 
 lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
 
 lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -8831,7 +8827,7 @@
 all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
 		$(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
+	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -8936,9 +8932,9 @@
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-libtool \
-	clean-noinstLIBRARIES clean-noinstPROGRAMS \
-	clean-serverLTLIBRARIES clean-serverPROGRAMS \
-	clean-serverpluginLTLIBRARIES mostlyclean-am
+	clean-noinstLIBRARIES clean-noinstPROGRAMS clean-sbinPROGRAMS \
+	clean-serverLTLIBRARIES clean-serverpluginLTLIBRARIES \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -8959,11 +8955,11 @@
 
 install-data-am: install-configDATA install-nodist_propertyDATA \
 	install-sampledataDATA install-schemaDATA \
-	install-serverLTLIBRARIES install-serverPROGRAMS \
-	install-serverSCRIPTS install-serverpluginLTLIBRARIES \
+	install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
 	install-taskSCRIPTS
 
-install-exec-am: install-binPROGRAMS install-binSCRIPTS
+install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+	install-sbinPROGRAMS
 
 install-info: install-info-am
 
@@ -8994,36 +8990,35 @@
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-configDATA uninstall-info-am \
 	uninstall-nodist_propertyDATA uninstall-sampledataDATA \
-	uninstall-schemaDATA uninstall-serverLTLIBRARIES \
-	uninstall-serverPROGRAMS uninstall-serverSCRIPTS \
-	uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
+	uninstall-sbinPROGRAMS uninstall-schemaDATA \
+	uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
+	uninstall-taskSCRIPTS
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic clean-libtool \
-	clean-noinstLIBRARIES clean-noinstPROGRAMS \
-	clean-serverLTLIBRARIES clean-serverPROGRAMS \
-	clean-serverpluginLTLIBRARIES ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-binSCRIPTS \
-	install-configDATA install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	clean-noinstLIBRARIES clean-noinstPROGRAMS clean-sbinPROGRAMS \
+	clean-serverLTLIBRARIES clean-serverpluginLTLIBRARIES ctags \
+	dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
+	dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-binSCRIPTS install-configDATA \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man \
 	install-nodist_propertyDATA install-sampledataDATA \
-	install-schemaDATA install-serverLTLIBRARIES \
-	install-serverPROGRAMS install-serverSCRIPTS \
-	install-serverpluginLTLIBRARIES install-strip \
-	install-taskSCRIPTS installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	install-sbinPROGRAMS install-schemaDATA \
+	install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
+	install-strip install-taskSCRIPTS installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-configDATA uninstall-info-am \
 	uninstall-nodist_propertyDATA uninstall-sampledataDATA \
-	uninstall-schemaDATA uninstall-serverLTLIBRARIES \
-	uninstall-serverPROGRAMS uninstall-serverSCRIPTS \
-	uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
+	uninstall-sbinPROGRAMS uninstall-schemaDATA \
+	uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
+	uninstall-taskSCRIPTS
 
 
 dirver.h: Makefile


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- aclocal.m4	7 Feb 2007 23:26:19 -0000	1.13
+++ aclocal.m4	7 Feb 2007 23:57:34 -0000	1.14
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +123,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +143,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,6 +163,7 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -182,15 +183,17 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+_LT_CC_BASENAME([$compiler])
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -231,11 +234,56 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
+
+
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -308,15 +356,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -485,7 +533,7 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -536,6 +584,22 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -567,7 +631,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -577,8 +641,10 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
[...3355 lines suppressed...]
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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.
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -6694,27 +7032,16 @@
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -6768,26 +7095,15 @@
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Helper functions for option handling.                     -*- Autoconf -*-
 
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -6812,28 +7128,16 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-#
-# Check to make sure that the build environment is sane.
-#
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_SANITY_CHECK
 # ---------------
@@ -6876,25 +7180,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# AM_PROG_INSTALL_STRIP
+# ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -6917,25 +7210,13 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004  Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.22 -r 1.23 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure	7 Feb 2007 23:26:19 -0000	1.22
+++ configure	7 Feb 2007 23:57:34 -0000	1.23
@@ -280,15 +280,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/fedora-ds
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
 XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3819,12 +3819,13 @@
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -3849,10 +3850,11 @@
     fi
   done
 done
-SED=$lt_cv_path_SED
 
 fi
 
+SED=$lt_cv_path_SED
+
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -3929,7 +3931,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -3963,7 +3965,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -3993,6 +3995,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -4003,36 +4014,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
 	  break
 	  ;;
 	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -4079,7 +4097,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[45]*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
@@ -4102,13 +4120,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -4124,7 +4142,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
[...8628 lines suppressed...]
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_GCJ
 
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_GCJ
 
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18570,7 +18010,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -18644,11 +18084,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18660,7 +18100,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18740,7 +18180,7 @@
 link_all_deplibs=$link_all_deplibs_GCJ
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18814,15 +18254,42 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 compiler_RC=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 lt_cv_prog_compiler_c_o_RC=yes
 
 # The else clause should only fire when bootstrapping the
@@ -18838,7 +18305,7 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18939,6 +18406,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -18950,12 +18423,18 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_RC
 
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
 
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -19015,7 +18494,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -19089,11 +18568,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -19105,7 +18584,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -19185,7 +18664,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -24309,7 +23788,7 @@
 db_ver_pat=`grep DB_VERSION_PATCH $db_incdir/db.h | awk '{print $3}'`
 db_libver=${db_ver_maj}.${db_ver_min}
 save_ldflags="$LDFLAGS"
-LDFLAGS="$db_lib"
+LDFLAGS="$db_lib $LDFLAGS"
 as_ac_Lib=`echo "ac_cv_lib_db-$db_libver''_db_create" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for db_create in -ldb-$db_libver" >&5
 echo $ECHO_N "checking for db_create in -ldb-$db_libver... $ECHO_C" >&6
@@ -26096,6 +25575,7 @@
 s, at CCDEPMODE@,$CCDEPMODE,;t t
 s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s, at SED@,$SED,;t t
 s, at EGREP@,$EGREP,;t t
 s, at LN_S@,$LN_S,;t t
 s, at ECHO@,$ECHO,;t t


Index: missing
===================================================================
RCS file: /cvs/dirsec/ldapserver/missing,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- missing	7 Feb 2007 23:26:19 -0000	1.8
+++ missing	7 Feb 2007 23:57:34 -0000	1.9
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2004-09-07.08
+scriptversion=2005-06-08.21
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
@@ -19,8 +19,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake at gnu.org>."
-    exit 0
+    exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
-    exit 0
+    exit $?
     ;;
 
   -*)
@@ -288,11 +288,18 @@
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
     touch $file
     ;;
 


Index: install-sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/install-sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- install-sh	7 Feb 2007 23:26:19 -0000	1.8
+++ install-sh	7 Feb 2007 23:57:34 -0000	1.9
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-09-10.20
+scriptversion=2005-05-14.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -109,7 +109,7 @@
         shift
         continue;;
 
-    --help) echo "$usage"; exit 0;;
+    --help) echo "$usage"; exit $?;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -134,7 +134,7 @@
 	shift
 	continue;;
 
-    --version) echo "$0 $scriptversion"; exit 0;;
+    --version) echo "$0 $scriptversion"; exit $?;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.
@@ -213,7 +213,7 @@
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -226,7 +226,8 @@
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
     IFS=$oIFS
 
     pathcomp=
@@ -295,7 +296,7 @@
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit
+		 (exit 1); exit 1
 	       }
 	     else
 	       :
@@ -306,12 +307,12 @@
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
     }
-  fi || { (exit 1); exit; }
+  fi || { (exit 1); exit 1; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit
+  (exit 0); exit 0
 }
 
 # Local variables:


Index: depcomp
===================================================================
RCS file: /cvs/dirsec/ldapserver/depcomp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- depcomp	7 Feb 2007 23:26:19 -0000	1.8
+++ depcomp	7 Feb 2007 23:57:34 -0000	1.9
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2004-05-31.23
+scriptversion=2005-07-09.11
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # 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
@@ -17,8 +17,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -50,11 +50,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -287,36 +287,43 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mecanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
       "$@" -Wc,-MD
    else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
       exit $stat
    fi
 
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -460,7 +467,8 @@
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"


Index: compile
===================================================================
RCS file: /cvs/dirsec/ldapserver/compile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- compile	7 Feb 2007 23:26:19 -0000	1.8
+++ compile	7 Feb 2007 23:57:34 -0000	1.9
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2004-09-10.20
+scriptversion=2005-05-14.22
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,11 +47,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -125,6 +125,8 @@
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"


Index: config.sub
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.sub,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config.sub	7 Feb 2007 23:26:19 -0000	1.7
+++ config.sub	7 Feb 2007 23:57:34 -0000	1.8
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-08-29'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@
 #
 # 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -231,13 +232,14 @@
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -246,6 +248,7 @@
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -254,23 +257,28 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -298,7 +306,7 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -310,7 +318,7 @@
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -319,6 +327,7 @@
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -327,6 +336,7 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -334,20 +344,23 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -489,6 +502,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -754,9 +771,8 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1029,6 +1045,10 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1078,12 +1098,9 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1170,7 +1187,8 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1188,7 +1206,7 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1297,6 +1315,9 @@
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1374,6 +1395,9 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1545,7 +1569,7 @@
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)


Index: config.guess
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.guess,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config.guess	7 Feb 2007 23:26:19 -0000	1.7
+++ config.guess	7 Feb 2007 23:57:34 -0000	1.8
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-09-07'
+timestamp='2005-07-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per at bothner.com>.
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +68,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -123,7 +125,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi at noc.rutgers.edu 1994-08-24)
@@ -196,55 +198,20 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,37 +264,43 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -335,32 +308,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -369,10 +342,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -384,10 +357,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -398,40 +371,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -455,32 +428,33 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -496,29 +470,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -526,7 +500,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -541,14 +515,18 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -562,28 +540,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -645,9 +623,19 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -655,11 +643,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -687,158 +675,166 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
+	exit ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -856,7 +852,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -875,14 +871,14 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -896,7 +892,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -904,25 +900,25 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -940,15 +936,15 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -976,15 +972,18 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -992,27 +991,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1020,15 +1019,16 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1046,73 +1046,73 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1120,61 +1120,65 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel at ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf at swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green at stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1182,7 +1186,7 @@
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1190,22 +1194,25 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1216,38 +1223,44 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1279,7 +1292,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1368,11 +1381,12 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1381,22 +1395,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1407,7 +1421,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be



From fedora-directory-commits at redhat.com  Wed Feb  7 23:57:41 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed,  7 Feb 2007 18:57:41 -0500
Subject: [Fedora-directory-commits] ldapserver/m4 db.m4,1.6,1.7
Message-ID: <200702072358.l17NwCiQ016123@cvs-int.fedora.redhat.com>

Author: rmeggins

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

Modified Files:
	db.m4 
Log Message:
esolves: bug 227618
Bug Description: FHS: move exes to _bindir; move ns-slapd to _sbindir
Reviewed by: many people (Thanks!)
Fix Description: In order to be more FHS compliant, we need to make the following changes:
1) move files executable by end users to _bindir (e.g. /usr/bin) - this means logconv.pl, ds_newinst, dbscan, etc.
2) move the server executable ns-slapd to _sbindir (e.g. /usr/sbin)
And, to be more packaging friendly, the additional changes:
3) move libback-ldbm to the plugins dir - it is a plugin
4) use the libtool -avoid-version flag with plugins - we don't need the .so.0.0.0 for plugins
I had to add support for sbindir and SBINDIR to create_instance and ds_newinst.  We were using serverdir for 3 things - command line programs, server specific shared libs, and the server executable itself.  These are now in 3 different places.  The biggest change was to the scripts.  I kept serverdir and SERVER-DIR to be the location of the server shared libs to avoid changing even more stuff.  I had to add SERVERBIN-DIR to the scripts - this is the location of ns-slapd and is set by sbindir in create_instance (which defaults to SBINDIR from Makefile.am which defaults to $prefix/sbin in configure - whew).
I've tested instance creation with these diffs - everything seems to work fine.
5) reorder files in alphabetical order - suggested by nkinder
6) add $LDFLAGS to test in db.m4
7) touch all template/wrapper .in files to make them newer than their corresponding files
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes, but the docs will have to change quite a bit for all of the FHS related changes. 



Index: db.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- db.m4	7 Feb 2007 23:26:19 -0000	1.6
+++ db.m4	7 Feb 2007 23:57:34 -0000	1.7
@@ -74,7 +74,7 @@
 dnl make sure the lib is available
 dnl use true so libdb won't be added to LIBS
 save_ldflags="$LDFLAGS"
-LDFLAGS="$db_lib"
+LDFLAGS="$db_lib $LDFLAGS"
 AC_CHECK_LIB([db-$db_libver], [db_create], [true],
   [AC_MSG_ERROR([$db_incdir/db.h is version $db_libver but libdb-$db_libver not found])],
   [$LIBNSL])



From fedora-directory-commits at redhat.com  Wed Feb  7 23:57:42 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed,  7 Feb 2007 18:57:42 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
	create_instance.c, 1.41, 1.42 create_instance.h, 1.13,
	1.14 ds_newinst.pl, 1.11, 1.12 ds_newinst.pl.in, 1.1, 1.2
Message-ID: <200702072358.l17NwC2S016127@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15984/ldapserver/ldap/admin/src

Modified Files:
	create_instance.c create_instance.h ds_newinst.pl 
	ds_newinst.pl.in 
Log Message:
esolves: bug 227618
Bug Description: FHS: move exes to _bindir; move ns-slapd to _sbindir
Reviewed by: many people (Thanks!)
Fix Description: In order to be more FHS compliant, we need to make the following changes:
1) move files executable by end users to _bindir (e.g. /usr/bin) - this means logconv.pl, ds_newinst, dbscan, etc.
2) move the server executable ns-slapd to _sbindir (e.g. /usr/sbin)
And, to be more packaging friendly, the additional changes:
3) move libback-ldbm to the plugins dir - it is a plugin
4) use the libtool -avoid-version flag with plugins - we don't need the .so.0.0.0 for plugins
I had to add support for sbindir and SBINDIR to create_instance and ds_newinst.  We were using serverdir for 3 things - command line programs, server specific shared libs, and the server executable itself.  These are now in 3 different places.  The biggest change was to the scripts.  I kept serverdir and SERVER-DIR to be the location of the server shared libs to avoid changing even more stuff.  I had to add SERVERBIN-DIR to the scripts - this is the location of ns-slapd and is set by sbindir in create_instance (which defaults to SBINDIR from Makefile.am which defaults to $prefix/sbin in configure - whew).
I've tested instance creation with these diffs - everything seems to work fine.
5) reorder files in alphabetical order - suggested by nkinder
6) add $LDFLAGS to test in db.m4
7) touch all template/wrapper .in files to make them newer than their corresponding files
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes, but the docs will have to change quite a bit for all of the FHS related changes. 



Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- create_instance.c	26 Jan 2007 20:00:40 -0000	1.41
+++ create_instance.c	7 Feb 2007 23:57:39 -0000	1.42
@@ -312,6 +312,7 @@
 
     conf->bak_dir = NULL;
     conf->config_dir = NULL;
+    conf->sbindir = NULL;
     conf->datadir = NULL;
     conf->db_dir = NULL;
     conf->docdir = NULL;
@@ -700,7 +701,7 @@
 {
     char myperl[PATH_SIZE];
     char fn[PATH_SIZE], ofn[PATH_SIZE];
-    const char *table[16][2];
+    const char *table[17][2];
 
     if (PR_FAILURE == PR_Access(cs_path, PR_ACCESS_EXISTS)) {
         printf("Notice: %s does not exist, skipping %s . . .\n", cs_path, name);
@@ -756,7 +757,9 @@
     table[13][1] = cf->run_dir;
     table[14][0] = "PRODUCT-NAME";
     table[14][1] = PRODUCT_NAME;
-    table[15][0] = table[15][1] = NULL;
+    table[15][0] = "SERVERBIN-DIR";
+    table[15][1] = cf->sbindir;
+    table[16][0] = table[16][1] = NULL;
 
     if (generate_script(ofn, fn, NEWSCRIPT_MODE, table) != 0) {
         return make_error("Could not write %s to %s (%s).", ofn, fn,
@@ -3219,7 +3222,7 @@
     fprintf(f, "objectclass: nsSlapdPlugin\n");
     fprintf(f, "objectclass: extensibleObject\n");
     fprintf(f, "cn: ldbm database\n");
-    fprintf(f, "nsslapd-pluginpath: %s/libback-ldbm%s\n", cf->sroot, shared_lib);
+    fprintf(f, "nsslapd-pluginpath: %s/libback-ldbm%s\n", cf->plugin_dir, shared_lib);
     fprintf(f, "nsslapd-plugininitfunc: ldbm_back_init\n");
     fprintf(f, "nsslapd-plugintype: database\n");
     fprintf(f, "nsslapd-pluginenabled: on\n");
@@ -4229,6 +4232,7 @@
  * cf->localstatedir: %{_localstatedir}
  * cf->sysconfdir: %{_sysconfdir}
  * cf->bindir: %{_bindir}
+ * cf->sbindir: %{_sbindir}
  * cf->datadir: %{_datadir}
  * cf->docdir: %{_docdir}
  * cf->inst_dir: <sroot>/slapd-<servid>
@@ -4461,6 +4465,7 @@
     cf->localstatedir = set_path_attribute("localstatedir", LOCALSTATEDIR, prefix);
     cf->sysconfdir = set_path_attribute("sysconfdir", SYSCONFDIR, prefix);
     cf->bindir = set_path_attribute("bindir", BINDIR, prefix);
+    cf->sbindir = set_path_attribute("sbindir", SBINDIR, prefix);
     cf->datadir = set_path_attribute("datadir", DATADIR, prefix);
     cf->docdir = set_path_attribute("docdir", DOCDIR, prefix);
 


Index: create_instance.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- create_instance.h	15 Nov 2006 17:17:39 -0000	1.13
+++ create_instance.h	7 Feb 2007 23:57:40 -0000	1.14
@@ -74,6 +74,9 @@
 #ifndef BINDIR
 #define BINDIR          "/usr/bin"
 #endif
+#ifndef SBINDIR
+#define SBINDIR         "/usr/sbin"
+#endif
 #ifndef DATADIR
 #define DATADIR         "/usr/share"
 #endif
@@ -87,6 +90,9 @@
 #ifndef BINDIR
 #define BINDIR          "/bin"
 #endif
+#ifndef SBINDIR
+#define SBINDIR         "/sbin"
+#endif
 #ifndef DATADIR
 #define DATADIR         "/share"
 #endif
@@ -101,6 +107,7 @@
 #define SYSCONFDIR      "\\etc"
 #define LIBDIR          "\\usr\\lib"
 #define BINDIR          "\\usr\\bin"
+#define SBINDIR         "\\usr\\sbin"
 #define DATADIR         "\\usr\\share"
 #define DOCDIR          "\\usr\\doc"
 #endif
@@ -110,6 +117,7 @@
     char *localstatedir;
     char *sysconfdir;
     char *bindir;
+    char *sbindir;
     char *datadir;
     char *docdir;
 


Index: ds_newinst.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ds_newinst.pl	10 Nov 2006 04:24:25 -0000	1.11
+++ ds_newinst.pl	7 Feb 2007 23:57:40 -0000	1.12
@@ -190,6 +190,7 @@
 $cgiargs{"localstatedir"} = $table{"slapd"}->{"localstatedir"};
 $cgiargs{"sysconfdir"} = $table{"slapd"}->{"sysconfdir"};
 $cgiargs{"bindir"} = $table{"slapd"}->{"bindir"};
+$cgiargs{"sbindir"} = $table{"slapd"}->{"sbindir"};
 $cgiargs{"datadir"} = $table{"slapd"}->{"datadir"};
 $cgiargs{"docdir"} = $table{"slapd"}->{"docdir"};
 $cgiargs{"inst_dir"} = $table{"slapd"}->{"inst_dir"};
@@ -253,9 +254,13 @@
 
 my $sroot = $cgiargs{sroot};
 
+my $prog = "/usr/bin/ds_newinst";
+if (! -x $prog) {
+    $prog = "/usr/lib/$brand_ds/ds_newinst";
+}
+
 my $rc = &cgiFake($sroot, $verbose,
-				  $prefix . "/usr/lib/$brand_ds/ds_newinst",
-				  \%cgiargs);
+				  $prog, \%cgiargs);
 
 if (!$rc) {
 	print "Success!  Your new directory server instance was created\n";


Index: ds_newinst.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds_newinst.pl.in	13 Nov 2006 23:45:44 -0000	1.1
+++ ds_newinst.pl.in	7 Feb 2007 23:57:40 -0000	1.2
@@ -190,6 +190,7 @@
 $cgiargs{"localstatedir"} = $table{"slapd"}->{"localstatedir"};
 $cgiargs{"sysconfdir"} = $table{"slapd"}->{"sysconfdir"};
 $cgiargs{"bindir"} = $table{"slapd"}->{"bindir"};
+$cgiargs{"sbindir"} = $table{"slapd"}->{"sbindir"};
 $cgiargs{"datadir"} = $table{"slapd"}->{"datadir"};
 $cgiargs{"docdir"} = $table{"slapd"}->{"docdir"};
 $cgiargs{"inst_dir"} = $table{"slapd"}->{"inst_dir"};
@@ -253,9 +254,13 @@
 
 my $sroot = $cgiargs{sroot};
 
+my $prog = "@bindir@/ds_newinst";
+if (! -x $prog) {
+    $prog = "@libdir@/$brand_ds/ds_newinst";
+}
+
 my $rc = &cgiFake($sroot, $verbose,
-				  "@libdir@/$brand_ds/ds_newinst",
-				  \%cgiargs);
+				  $prog, \%cgiargs);
 
 if (!$rc) {
 	print "Success!  Your new directory server instance was created\n";



From fedora-directory-commits at redhat.com  Wed Feb  7 23:57:42 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed,  7 Feb 2007 18:57:42 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
	template-bak2db, 1.1, 1.2 template-bak2db.in, 1.3,
	1.4 template-db2bak, 1.1, 1.2 template-db2bak.in, 1.3,
	1.4 template-db2index, 1.1, 1.2 template-db2index.in, 1.3,
	1.4 template-db2ldif, 1.1, 1.2 template-db2ldif.in, 1.3,
	1.4 template-ldif2db, 1.1, 1.2 template-ldif2db.in, 1.3,
	1.4 template-restoreconfig, 1.1, 1.2 template-restoreconfig.in,
	1.3, 1.4 template-saveconfig, 1.1, 1.2 template-saveconfig.in,
	1.3, 1.4 template-start-slapd, 1.2,
	1.3 template-start-slapd.in, 1.5, 1.6 template-stop-slapd, 1.2,
	1.3 template-stop-slapd.in, 1.5, 1.6 template-suffix2instance,
	1.1, 1.2 template-suffix2instance.in, 1.3,
	1.4 template-upgradedb.in, 1.3, 1.4 template-vlvindex, 1.1,
	1.2 template-vlvindex.in, 1.3, 1.4
Message-ID: <200702072358.l17NwCBo016131@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15984/ldapserver/ldap/admin/src/scripts

Modified Files:
	template-bak2db template-bak2db.in template-db2bak 
	template-db2bak.in template-db2index template-db2index.in 
	template-db2ldif template-db2ldif.in template-ldif2db 
	template-ldif2db.in template-restoreconfig 
	template-restoreconfig.in template-saveconfig 
	template-saveconfig.in template-start-slapd 
	template-start-slapd.in template-stop-slapd 
	template-stop-slapd.in template-suffix2instance 
	template-suffix2instance.in template-upgradedb.in 
	template-vlvindex template-vlvindex.in 
Log Message:
esolves: bug 227618
Bug Description: FHS: move exes to _bindir; move ns-slapd to _sbindir
Reviewed by: many people (Thanks!)
Fix Description: In order to be more FHS compliant, we need to make the following changes:
1) move files executable by end users to _bindir (e.g. /usr/bin) - this means logconv.pl, ds_newinst, dbscan, etc.
2) move the server executable ns-slapd to _sbindir (e.g. /usr/sbin)
And, to be more packaging friendly, the additional changes:
3) move libback-ldbm to the plugins dir - it is a plugin
4) use the libtool -avoid-version flag with plugins - we don't need the .so.0.0.0 for plugins
I had to add support for sbindir and SBINDIR to create_instance and ds_newinst.  We were using serverdir for 3 things - command line programs, server specific shared libs, and the server executable itself.  These are now in 3 different places.  The biggest change was to the scripts.  I kept serverdir and SERVER-DIR to be the location of the server shared libs to avoid changing even more stuff.  I had to add SERVERBIN-DIR to the scripts - this is the location of ns-slapd and is set by sbindir in create_instance (which defaults to SBINDIR from Makefile.am which defaults to $prefix/sbin in configure - whew).
I've tested instance creation with these diffs - everything seems to work fine.
5) reorder files in alphabetical order - suggested by nkinder
6) add $LDFLAGS to test in db.m4
7) touch all template/wrapper .in files to make them newer than their corresponding files
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes, but the docs will have to change quite a bit for all of the FHS related changes. 



Index: template-bak2db
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-bak2db,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-bak2db	27 Oct 2006 16:45:18 -0000	1.1
+++ template-bak2db	7 Feb 2007 23:57:40 -0000	1.2
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
 if [ $# -lt 1 ] || [ $# -gt 3 ]
@@ -30,7 +30,7 @@
     archivedir=`pwd`/$archivedir
 fi
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ "$#" -eq 2 ]
 then
     ./ns-slapd archive2db -D {{CONFIG-DIR}} -a $archivedir -n $bename


Index: template-bak2db.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-bak2db.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-bak2db.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-bak2db.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -4,7 +4,7 @@
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
@@ -36,7 +36,7 @@
     archivedir=`pwd`/$archivedir
 fi
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ "$#" -eq 2 ]
 then
     ./ns-slapd archive2db -D {{CONFIG-DIR}} -a $archivedir -n $bename


Index: template-db2bak
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-db2bak	27 Oct 2006 16:45:18 -0000	1.1
+++ template-db2bak	7 Feb 2007 23:57:40 -0000	1.2
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ "$#" -eq 1 ]
 then
 	bak_dir=$1


Index: template-db2bak.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2bak.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-db2bak.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-db2bak.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -4,7 +4,7 @@
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
@@ -12,7 +12,7 @@
 SHLIB_PATH=$LD_LIBRARY_PATH
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ "$#" -eq 1 ]
 then
 	bak_dir=$1


Index: template-db2index
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2index,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-db2index	27 Oct 2006 16:45:18 -0000	1.1
+++ template-db2index	7 Feb 2007 23:57:40 -0000	1.2
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ $# -eq 0 ]
 then
 	bak_dir={{BAK-DIR}}/reindex_`date +%Y_%m_%d_%H_%M_%S`


Index: template-db2index.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2index.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-db2index.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-db2index.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -4,7 +4,7 @@
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
@@ -12,7 +12,7 @@
 SHLIB_PATH=$LD_LIBRARY_PATH
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ $# -eq 0 ]
 then
 	bak_dir={{BAK-DIR}}/reindex_`date +%Y_%m_%d_%H_%M_%S`


Index: template-db2ldif
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-db2ldif	27 Oct 2006 16:45:18 -0000	1.1
+++ template-db2ldif	7 Feb 2007 23:57:40 -0000	1.2
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ "$#" -lt 2 ];
 then
 	echo "Usage: db2ldif {-n backend_instance}* | {-s includesuffix}*"


Index: template-db2ldif.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-db2ldif.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-db2ldif.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-db2ldif.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -4,7 +4,7 @@
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
@@ -12,7 +12,7 @@
 SHLIB_PATH=$LD_LIBRARY_PATH
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ "$#" -lt 2 ];
 then
 	echo "Usage: db2ldif {-n backend_instance}* | {-s includesuffix}*"
@@ -37,7 +37,7 @@
 done
 if [ $ldif_file = "mydummy" ]
 then
-	ldif_file={{LDIF-DIR}}/laputa-`date +%Y_%m_%d_%H%M%S`.ldif
+	ldif_file={{LDIF-DIR}}/`date +%Y_%m_%d_%H%M%S`.ldif
 fi
 if [ $set_ldif -eq 2 ]
 then


Index: template-ldif2db
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ldif2db,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-ldif2db	27 Oct 2006 16:45:18 -0000	1.1
+++ template-ldif2db	7 Feb 2007 23:57:40 -0000	1.2
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ $# -lt 4 ]
 then
 	echo "Usage: ldif2db -n backend_instance | {-s includesuffix}* [{-x excludesuffix}*]"


Index: template-ldif2db.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ldif2db.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-ldif2db.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-ldif2db.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -4,7 +4,7 @@
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
@@ -12,7 +12,7 @@
 SHLIB_PATH=$LD_LIBRARY_PATH
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ $# -lt 4 ]
 then
 	echo "Usage: ldif2db -n backend_instance | {-s includesuffix}* [{-x excludesuffix}*]"


Index: template-restoreconfig
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-restoreconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-restoreconfig	27 Oct 2006 16:45:18 -0000	1.1
+++ template-restoreconfig	7 Feb 2007 23:57:40 -0000	1.2
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 conf_ldif=`ls -1t {{BAK-DIR}}/{{SERV-ID}}-*.ldif | head -1`
 if [ -z "$conf_ldif" ]
 then


Index: template-restoreconfig.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-restoreconfig.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-restoreconfig.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-restoreconfig.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 conf_ldif=`ls -1t {{BAK-DIR}}/{{SERV-ID}}-*.ldif | head -1`
 if [ -z "$conf_ldif" ]
 then


Index: template-saveconfig
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-saveconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-saveconfig	27 Oct 2006 16:45:18 -0000	1.1
+++ template-saveconfig	7 Feb 2007 23:57:40 -0000	1.2
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 echo saving configuration ...
 conf_ldif={{BAK-DIR}}/{{SERV-ID}}-`date +%Y_%m_%d_%H%M%S`.ldif
 ./ns-slapd db2ldif -N -D {{CONFIG-DIR}} -s "o=NetscapeRoot" -a $conf_ldif -n NetscapeRoot 2>&1


Index: template-saveconfig.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-saveconfig.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-saveconfig.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-saveconfig.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 echo saving configuration ...
 conf_ldif={{BAK-DIR}}/{{SERV-ID}}-`date +%Y_%m_%d_%H%M%S`.ldif
 ./ns-slapd db2ldif -N -D {{CONFIG-DIR}} -s "o=NetscapeRoot" -a $conf_ldif -n NetscapeRoot 2>&1


Index: template-start-slapd
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- template-start-slapd	5 Feb 2007 22:30:12 -0000	1.2
+++ template-start-slapd	7 Feb 2007 23:57:40 -0000	1.3
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
 # Script that starts the ns-slapd server.
@@ -12,8 +12,6 @@
 #       1: Server could not be started
 #       2: Server already running
 
-NETSITE_ROOT={{SERVER-DIR}}
-export NETSITE_ROOT
 DS_CONFIG_DIR={{CONFIG-DIR}}
 export DS_CONFIG_DIR
 PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid
@@ -36,7 +34,7 @@
         rm -f $PIDFILE
     fi
 fi
-cd {{SERVER-DIR}}; ./ns-slapd -D {{CONFIG-DIR}} -i $PIDFILE -w $STARTPIDFILE "$@"
+cd {{SERVERBIN-DIR}}; ./ns-slapd -D {{CONFIG-DIR}} -i $PIDFILE -w $STARTPIDFILE "$@"
 if [ $? -ne 0 ]; then
     exit 1
 fi


Index: template-start-slapd.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template-start-slapd.in	6 Feb 2007 21:44:09 -0000	1.5
+++ template-start-slapd.in	7 Feb 2007 23:57:40 -0000	1.6
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+SHLIB_PATH=$prefix{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export SHLIB_PATH
 
 # Script that starts the ns-slapd server.
@@ -12,8 +12,6 @@
 #       1: Server could not be started
 #       2: Server already running
 
-NETSITE_ROOT={{SERVER-DIR}}
-export NETSITE_ROOT
 DS_CONFIG_DIR={{CONFIG-DIR}}
 export DS_CONFIG_DIR
 PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid
@@ -36,7 +34,7 @@
         rm -f $PIDFILE
     fi
 fi
-cd {{SERVER-DIR}}; ./ns-slapd -D {{CONFIG-DIR}} -i $PIDFILE -w $STARTPIDFILE "$@"
+cd {{SERVERBIN-DIR}}; ./ns-slapd -D {{CONFIG-DIR}} -i $PIDFILE -w $STARTPIDFILE "$@"
 if [ $? -ne 0 ]; then
     exit 1
 fi


Index: template-stop-slapd
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-stop-slapd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- template-stop-slapd	5 Feb 2007 22:30:12 -0000	1.2
+++ template-stop-slapd	7 Feb 2007 23:57:40 -0000	1.3
@@ -1,11 +1,5 @@
 #!/bin/sh
 
-prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
-export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
-export SHLIB_PATH
-
 # Script that stops the ns-slapd server.
 # Exit status can be:
 #       0: Server stopped successfully


Index: template-stop-slapd.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-stop-slapd.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template-stop-slapd.in	6 Feb 2007 21:44:09 -0000	1.5
+++ template-stop-slapd.in	7 Feb 2007 23:57:40 -0000	1.6
@@ -1,11 +1,5 @@
 #!/bin/sh
 
-prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
-export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
-export SHLIB_PATH
-
 # Script that stops the ns-slapd server.
 # Exit status can be:
 #       0: Server stopped successfully


Index: template-suffix2instance
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-suffix2instance,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-suffix2instance	27 Oct 2006 16:45:18 -0000	1.1
+++ template-suffix2instance	7 Feb 2007 23:57:40 -0000	1.2
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ $# -lt 2 ]
 then
 	echo Usage: suffix2instance {-s includesuffix}*


Index: template-suffix2instance.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-suffix2instance.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-suffix2instance.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-suffix2instance.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ $# -lt 2 ]
 then
 	echo Usage: suffix2instance {-s includesuffix}*


Index: template-upgradedb.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-upgradedb.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-upgradedb.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-upgradedb.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ "$#" -eq 1 ]
 then
 	bak_dir=$1


Index: template-vlvindex
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-vlvindex,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- template-vlvindex	27 Oct 2006 16:45:18 -0000	1.1
+++ template-vlvindex	7 Feb 2007 23:57:40 -0000	1.2
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix/usr/lib/dirsec:$prefix/usr/lib:/usr/lib/dirsec
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ $# -lt 4 ]
 then
 	echo "Usage: vlvindex -n backend_instance | {-s includesuffix}* -T attribute"


Index: template-vlvindex.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-vlvindex.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- template-vlvindex.in	28 Nov 2006 17:13:48 -0000	1.3
+++ template-vlvindex.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix at nss_libdir@:$prefix at libdir@:@nss_libdir@
 export SHLIB_PATH
 
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
 if [ $# -lt 4 ]
 then
 	echo "Usage: vlvindex -n backend_instance | {-s includesuffix}* -T attribute"



From fedora-directory-commits at redhat.com  Thu Feb  8 18:40:20 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  8 Feb 2007 13:40:20 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
	create_instance.c, 1.42, 1.43
Message-ID: <200702081840.l18IeKMc026765@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26722/ldapserver/ldap/admin/src

Modified Files:
	create_instance.c 
Log Message:
Resolves: bug 227771
Bug Description: FHS: use sysconfdir (/etc) as config file location
Reviewed by: nhosoi (Thanks!)
Fix Description: After much deliberation, we have decided that it is ok that our dynamic config files are under /etc/fedora-ds/slapd-instance.
So the config_dir will be /etc/fedora-ds/slapd-instance and the security and schema files will go there as well.  Since the FHS is ambiguous about this issue, and it will be very confusing if the configuration files are not under /etc, and there are some agents (webmin, cfengine) that do "dynamically" modify config files under /etc, this outweighs any considerations about having the server using it's config file like an "ascii database".
In addition, the presence of repl-monitor-cgi causes rpm to complain, and since we only support CGIs in the Admin Server, this file has been removed from the core fedora-ds package.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no 



Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- create_instance.c	7 Feb 2007 23:57:39 -0000	1.42
+++ create_instance.c	8 Feb 2007 18:40:12 -0000	1.43
@@ -1737,8 +1737,10 @@
     gen_script_auto(mysroot, mycs_path, "verify-db.pl", cf)
 
 /* tentatively moved to mycs_path */
+#ifdef MOVE_TO_ADMIN_SERVER
 #define CREATE_REPL_MONITOR_CGI() \
     gen_script_auto(mysroot, mycs_path, "repl-monitor-cgi.pl", cf)
+#endif
 
 #define CREATE_ACCOUNT_INACT(_commandName) \
     gen_script_auto(mysroot, cs_path, _commandName, cf)
@@ -1897,8 +1899,10 @@
     t = CREATE_VERIFYDB();
     if(t) return t;
 
+#ifdef MOVE_TO_ADMIN_SERVER
     t = CREATE_REPL_MONITOR_CGI();
     if(t) return t;
+#endif
 
     t = CREATE_ACCOUNT_INACT("ns-inactivate.pl");
     if(t) return t;
@@ -2410,8 +2414,10 @@
     t = CREATE_VERIFYDB();
     if(t) return t;
 
+#ifdef MOVE_TO_ADMIN_SERVER
     t = CREATE_REPL_MONITOR_CGI();
     if(t) return t;
+#endif
 
     t = gen_script(cs_path, "suffix2instance.bat",
            "@if not \"%%echo%%\" == \"on\" echo off\n\n"
@@ -4479,8 +4485,8 @@
 
     temp = ds_a_get_cgi_var("config_dir", NULL, NULL);
     if (NULL == temp) {
-        cf->config_dir = PR_smprintf("%s%clib%c%s%c%s-%s",
-                            cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+        cf->config_dir = PR_smprintf("%s%c%s%c%s-%s",
+                            cf->sysconfdir, FILE_PATHSEP,
                             cf->brand_ds, FILE_PATHSEP,
                             PRODUCT_NAME, cf->servid);
     } else {
@@ -4492,8 +4498,8 @@
     cf->schema_dir = ds_a_get_cgi_var("schema_dir", NULL, NULL);
     temp = ds_a_get_cgi_var("schema_dir", NULL, NULL);
     if (NULL == temp) {
-        cf->schema_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cschema",
-                            cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
+        cf->schema_dir = PR_smprintf("%s%c%s%c%s-%s%cschema",
+                            cf->sysconfdir, FILE_PATHSEP,
                             cf->brand_ds, FILE_PATHSEP,
                             PRODUCT_NAME, cf->servid, FILE_PATHSEP);
     } else {



From fedora-directory-commits at redhat.com  Thu Feb  8 18:40:14 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu,  8 Feb 2007 13:40:14 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.21,
	1.22 Makefile.in, 1.24, 1.25 ltmain.sh, 1.6, 1.7 aclocal.m4,
	1.14, 1.15 configure, 1.23, 1.24 missing, 1.9, 1.10 install-sh,
	1.9, 1.10 depcomp, 1.9, 1.10 compile, 1.9, 1.10 config.sub,
	1.8, 1.9 config.guess, 1.8, 1.9
Message-ID: <200702081840.l18Iejfi026770@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26722/ldapserver

Modified Files:
	Makefile.am Makefile.in ltmain.sh aclocal.m4 configure missing 
	install-sh depcomp compile config.sub config.guess 
Log Message:
Resolves: bug 227771
Bug Description: FHS: use sysconfdir (/etc) as config file location
Reviewed by: nhosoi (Thanks!)
Fix Description: After much deliberation, we have decided that it is ok that our dynamic config files are under /etc/fedora-ds/slapd-instance.
So the config_dir will be /etc/fedora-ds/slapd-instance and the security and schema files will go there as well.  Since the FHS is ambiguous about this issue, and it will be very confusing if the configuration files are not under /etc, and there are some agents (webmin, cfengine) that do "dynamically" modify config files under /etc, this outweighs any considerations about having the server using it's config file like an "ascii database".
In addition, the presence of repl-monitor-cgi causes rpm to complain, and since we only support CGIs in the Admin Server, this file has been removed from the core fedora-ds package.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no 



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.am	7 Feb 2007 23:57:34 -0000	1.21
+++ Makefile.am	8 Feb 2007 18:40:12 -0000	1.22
@@ -166,7 +166,6 @@
 	ldap/admin/src/scripts/template-ns-activate.pl \
 	ldap/admin/src/scripts/template-ns-inactivate.pl \
 	ldap/admin/src/scripts/template-ns-newpwpolicy.pl \
-	ldap/admin/src/scripts/template-repl-monitor-cgi.pl \
 	ldap/admin/src/scripts/template-repl-monitor.pl \
 	ldap/admin/src/scripts/template-verify-db.pl \
 	$(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in	7 Feb 2007 23:57:34 -0000	1.24
+++ Makefile.in	8 Feb 2007 18:40:12 -0000	1.25
@@ -1052,7 +1052,6 @@
 	ldap/admin/src/scripts/template-ns-activate.pl \
 	ldap/admin/src/scripts/template-ns-inactivate.pl \
 	ldap/admin/src/scripts/template-ns-newpwpolicy.pl \
-	ldap/admin/src/scripts/template-repl-monitor-cgi.pl \
 	ldap/admin/src/scripts/template-repl-monitor.pl \
 	ldap/admin/src/scripts/template-verify-db.pl \
 	$(srcdir)/ldap/admin/src/scripts/template-migrate5to7 \


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ltmain.sh	7 Feb 2007 23:26:19 -0000	1.6
+++ ltmain.sh	8 Feb 2007 18:40:12 -0000	1.7
@@ -46,10 +46,16 @@
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -105,12 +111,14 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+         save_$lt_var=\$$lt_var
+         $lt_var=C
+         export $lt_var
+       fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +144,8 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -327,7 +337,17 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         extracted_serial=`expr $extracted_serial + 1`
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+    case $arg in
+    -all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1169,20 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+    -static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+    -static-libtool-libs)
+      if test -z "$pic_flag" && test -n "$link_static_flag"; then
+        dlopen_self=$dlopen_self_static
+      fi
+      prefer_static_libs=yes
+      ;;
+    esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1712,7 +1742,7 @@
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+         { { test "$prefer_static_libs" = no ||
+             test "$prefer_static_libs,$installed" = "built,yes"; } ||
+           test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3410,11 +3442,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+#      for path in $notinst_path; do
+#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+#      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3591,7 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4239,12 +4268,14 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4747,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4877,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5624,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +5969,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+               $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
+
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6837,11 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 



















From fedora-directory-commits at redhat.com  Thu Feb  8 19:09:45 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Thu,  8 Feb 2007 14:09:45 -0500
Subject: [Fedora-directory-commits] coolkey/src/install Makefile,1.2,NONE
Message-ID: <200702081909.l18J9jc0030451@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/install
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30437

Removed Files:
	Makefile 
Log Message:


Let configure create the Makefile if necessary



--- Makefile DELETED ---



From fedora-directory-commits at redhat.com  Thu Feb  8 19:25:14 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Thu,  8 Feb 2007 14:25:14 -0500
Subject: [Fedora-directory-commits] coolkey README,1.1,1.2
Message-ID: <200702081925.l18JPEvr030638@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30618

Modified Files:
	README 
Log Message:


Update README from the latest information from the wiki



Index: README
===================================================================
RCS file: /cvs/dirsec/coolkey/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README	25 Aug 2006 00:31:39 -0000	1.1
+++ README	8 Feb 2007 19:25:12 -0000	1.2
@@ -1,55 +1,185 @@
-Building:
+How to build on various platforms.
+A more up to date version of this may be found at 
+http://directory.fedora.redhat.com/wiki/BuildCoolKey
+
+
+Linux/Unix
+---------------------------------------------------------------------------
+Prerequisites
+
+You will need the following packages installed (or equivalent for your OS):
+
+    * pcsc-lite-devel
+    * xlib-devel
+    * glibc
+    * gcc
+    * autoconf 
+
+Building
+
+In the root directory run the following commands:
 
-Linux/Unix:
 autoconf
 ./configure
+make
 
 If you need to modify the Makefiles, automake 1.9.6 was used. Makefile.am is 
 included in the source.
 
-------------------------------------------------------------------------------
+Installing
+
+In the root directory run:
+
+make install
+
+or
+
+make install DEST=/my/destination/tree
+
+
+
+Mac OS X
+---------------------------------------------------------------------------
+
+CoolKey can be compiled as a universal binary on the Mac.
+
+Prerequisites
+
+    * Intel or PPC Mac
+    * OS X Tiger
+    * Version 2.59 of autoconf
+    * XCode 2.2 and later
+    * Make sure the framework "/Developer/SDKs/MacOSX10.4u.sdk" is present 
+
+Building
+
+   1. checkout coolkey source
+   2. proceed to the coolkey directory
+   3. Type the following: 
+
+autoconf
+./configure --disable-dependency-tracking
+make
+
+If the autoconf step fails, an outdated version of autoconf may be installed. 
+Perform "autoconf --version" to make sure 2.59 is the version present.
+
+As of right now, the above will build CoolKey dynamic libraries as only the 
+native binary of the build machine. For instance, performing this build on an 
+Intel Mac will build universal object files but leave the dynamic libraries as 
+Intel only. Until this problem can be resolved, the following can be done to 
+complete an actual universal binary build of everything.
+
+After the configure step and prior to the actual Make, do the following:
 
-Mac OS X:
+   1. edit the file "libtool". Be sure to back up the original copy.
+   2. search for lines with instances of the strings "archive_cmds" and 
+      "module_expsym_cmds".
+   3. Between the strings "\$deplibs" and "\$compiler_flags", 
+      place the following: 
 
-------------------------------------------------------------------------------
+    -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386
 
-Windows:
+Example:
 
-Prereqs -
-Microsoft Visual C++ and Platform SDK.
-Install as normal. Make sure INCLUDE and LIB are set appropriately.
-These are available at (http://msdn.microsoft.com/visualc/)
+#Commands used to build and install a shared archive.
+archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs 
+-isysroot /Developer/SDKs/MacOSX10.4u.sdk  -arch ppc -arch i386 
+\$compiler_flags -install_name \$rpath/\$soname \$verstring"
 
-Cygwin
-Install as normal. You'll need base, the shell, autoconf-2.5x, cvs*...
-This can be downloaded at (http://www.cygwin.com)
 
-ZLib
-Download ZLib source an binaries from here (http://www.zlib.org)
-Unzip into a known directory (like c:/zlib)
-Set ZLIB_INCLUDE to the location of the include files (e.g. c:/zlib/include)
-and ZLIB_LIB to the location of the export libraries (e.g. c:/zlib/lib) 
+    * At this point, performing a "make" will result in universal binary 
+    versions of each dynamic library associated with CoolKey. 
+
+It is also possible to build the utility "pk11install" on the Mac. This 
+utility can be used to automatically install CoolKey into Mozilla browsers on 
+the user's system.
+
+    * Building "pk11install" will requre the configure script to be launched 
+with the following two environment variables: 
+
+NSS_CFLAGS=
+NSS_LIBS=
+
+    * NSS_CFLAGS has to be set to the include paths of NSS and NSPR currently 
+installed on the system.
+    * NSS_LIBS has to be set to the search path of the NSS and NSPR shared 
+libraries.
+    * Example invocation: 
+
+./configure --disable-dependency-tracking NSS_CFLAGS="-I /usr/local/include/nspr -I /usr/local/include/nss" NSS_LIBS="-L/usr/local/lib/nss" --enable-pkinstall
+ make
+
+Installing
+
+    * After a successful build of CoolKey, the Makefile can be used to perform 
+   a simple install of the software on the system if desired. 
+
+   1. Within the build directory perform the following: 
+
+make  install
+
+    * By default, everything will be placed in "/usr/local/lib" and 
+    "/usr/local/lib/pkcs11".
+    * An alternate prefix directory, instead of "/usr/local" can be selected 
+    at configure time as demonstrated below: 
+
+./configure --prefix=/usr/local/CoolKey --disable-dependency-tracking
+
+    * In the above example the install will result in everything being located 
+    in "/usr/local/CoolKey/lib" and "/usr/local/CoolKey/lib/pkcs11". 
+
+    * If desired the following example demonstartes how to install everything 
+    in an alternate base location: 
+
+make DESTDIR=/build/staging-area install
+
+    * The above will install the previous example in 
+    "/build/staging/usr/local/CoolKey". 
+
+
+
+Windows
+---------------------------------------------------------------------------
+
+Prerequisites
+
+    * Microsoft Visual C++ and Platform SDK: Install as normal. 
+    Make sure INCLUDE and LIB are set appropriately. These are available at 
+    (http://msdn.microsoft.com/visualc/)
+    * Cygwin: Install as normal. You'll need base, the shell, autoconf-2.5x, 
+    make, cvs*... This can be downloaded at (http://www.cygwin.com) 
+
+* This may not be a full list. If you discover additional packages which are 
+needed please let us know, or update the wiki 
+(http://directory/fedora.redhat.com/wiki/BuildCoolKey).
+
+    * ZLib Download ZLib source an binaries from here (http://www.zlib.org)
+         1. Unzip into a known directory (like c:/zlib)
+         2. Set ZLIB_INCLUDE to the location of the include files 
+            (e.g. c:/zlib/include)
+         3. Set ZLIB_LIB to the location of the export libraries 
+            (e.g. c:/zlib/lib) 
+
+Building
 
 Once everything is installed, start a cygwin shell.
-1. checkout the coolkey source
-2. Make sure the environment variables INCLUDE, LIB, ZLIB_INCLUDE, and ZLIB_LIB 
-are defined.
-3. Make sure the Visual C++ tools are in your path.
 
-In the root directory type:
+   1. checkout the coolkey source
+   2. Make sure the environment variables INCLUDE, LIB, ZLIB_INCLUDE, and 
+   ZLIB_LIB are defined as described above in Prerequisites.
+   3. Make sure the Visual C++ tools are in your path.
+   4. In the root directory type: 
 
 autoconf-2.5x
 ./configure
 make
 
+Installing
 
-NOTE: Make install does not work on windows. You'll need to fetch
-src/libckyapplet/.lib/libckyapplet-1.dll
-src/coolkeypk11/.lib/libcookeypk11.dll
-and
-zlib1.dll from your zlibdirectory and install it in your windows system32 
-directory.
+Make install does not work on windows. You'll need to fetch 
+src/libckyapplet/.lib/libckyapplet-1.dll, 
+src/coolkeypk11/.lib/libcookeypk11.dll and zlib1.dll from your zlibdirectory 
+and install it in your windows system32 directory. 
 
 
-* This may not be a full list. If you discover additional packages which are 
-needed please let us know.



From fedora-directory-commits at redhat.com  Fri Feb  9 18:47:45 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri,  9 Feb 2007 13:47:45 -0500
Subject: [Fedora-directory-commits] 
	coolkey configure.in, 1.9, 1.10 configure,
	1.7, 1.8 config.status, 1.6, 1.7
Message-ID: <200702091847.l19IljSv022246@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22218

Modified Files:
	configure.in configure config.status 
Log Message:


Move optional enable-pk11install line so linux compiles correctly.



Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure.in	6 Feb 2007 19:47:30 -0000	1.9
+++ configure.in	9 Feb 2007 18:47:42 -0000	1.10
@@ -85,20 +85,6 @@
 	;;
 esac
 
-# Add argument for pk11install
-AC_ARG_ENABLE(pk11install, 
-  [  --enable-pk11install          build an installer for legacy user apps(default=no)])
-if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true"
-then
-if test $WINDOWS -ne 1; then
-  PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ])
-fi
-  enable_pk11install = "yes"
-else
-  enable_pk11install = "no"
-  AC_MSG_WARN([skipping pk11install])
-fi
-
 
 # Checks for programs.
 AC_PROG_CC
@@ -132,6 +118,21 @@
         fi
       ])
 fi
+
+# Add argument for pk11install
+AC_ARG_ENABLE(pk11install, 
+  [  --enable-pk11install          build an installer for legacy user apps(default=no)])
+if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true"
+then
+if test $WINDOWS -ne 1; then
+  PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ])
+fi
+  enable_pk11install = "yes"
+else
+  enable_pk11install = "no"
+  AC_MSG_WARN([skipping pk11install])
+fi
+
 AC_SUBST(NSS_CFLAGS)
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)


Index: configure
===================================================================
RCS file: /cvs/dirsec/coolkey/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure	30 Nov 2006 22:35:22 -0000	1.7
+++ configure	9 Feb 2007 18:47:42 -0000	1.8
@@ -463,7 +463,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PKG_CONFIG ac_pt_PKG_CONFIG NSS_CFLAGS NSS_LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__f!
 astdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCKYAPPLET PCSC_CFLAGS PCSC_LIBS ZLIB_CFLAGS ZLIB_LIBS SCARD_LIB_NAME HAVE_PCSC_TRUE HAVE_PCSC_FALSE BUILD_PK11INSTALL_TRUE BUILD_PK11INSTALL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S E!
 CHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCKYAPPLET PKG_CONFIG ac_pt_PKG_CONFIG PCSC_CFLAGS PCSC_LIBS NSS_CFLAGS NSS_LIBS ZLIB_CFLAGS ZLIB_LIBS SCARD_LIB_NAME HAVE_PCSC_TRUE HAVE_PCSC_FALSE BUILD_PK11INSTALL_TRUE BUILD_PK11INSTALL_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -904,18 +904,6 @@
 ac_env_target_alias_value=$target_alias
 ac_cv_env_target_alias_set=${target_alias+set}
 ac_cv_env_target_alias_value=$target_alias
-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_env_NSS_CFLAGS_set=${NSS_CFLAGS+set}
-ac_env_NSS_CFLAGS_value=$NSS_CFLAGS
-ac_cv_env_NSS_CFLAGS_set=${NSS_CFLAGS+set}
-ac_cv_env_NSS_CFLAGS_value=$NSS_CFLAGS
-ac_env_NSS_LIBS_set=${NSS_LIBS+set}
-ac_env_NSS_LIBS_value=$NSS_LIBS
-ac_cv_env_NSS_LIBS_set=${NSS_LIBS+set}
-ac_cv_env_NSS_LIBS_value=$NSS_LIBS
 ac_env_CC_set=${CC+set}
 ac_env_CC_value=$CC
 ac_cv_env_CC_set=${CC+set}
@@ -956,6 +944,10 @@
 ac_env_FFLAGS_value=$FFLAGS
 ac_cv_env_FFLAGS_set=${FFLAGS+set}
 ac_cv_env_FFLAGS_value=$FFLAGS
+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
 ac_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set}
 ac_env_PCSC_CFLAGS_value=$PCSC_CFLAGS
 ac_cv_env_PCSC_CFLAGS_set=${PCSC_CFLAGS+set}
@@ -964,6 +956,14 @@
 ac_env_PCSC_LIBS_value=$PCSC_LIBS
 ac_cv_env_PCSC_LIBS_set=${PCSC_LIBS+set}
 ac_cv_env_PCSC_LIBS_value=$PCSC_LIBS
+ac_env_NSS_CFLAGS_set=${NSS_CFLAGS+set}
+ac_env_NSS_CFLAGS_value=$NSS_CFLAGS
+ac_cv_env_NSS_CFLAGS_set=${NSS_CFLAGS+set}
+ac_cv_env_NSS_CFLAGS_value=$NSS_CFLAGS
+ac_env_NSS_LIBS_set=${NSS_LIBS+set}
+ac_env_NSS_LIBS_value=$NSS_LIBS
+ac_cv_env_NSS_LIBS_set=${NSS_LIBS+set}
+ac_cv_env_NSS_LIBS_value=$NSS_LIBS
 
 #
 # Report the --help message.
@@ -1049,7 +1049,6 @@
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --enable-debug          add debugging code (default=yes)
-  --enable-pk11install          build an installer for legacy user apps(default=no)
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-shared[=PKGS]
@@ -1059,6 +1058,7 @@
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-pk11install          build an installer for legacy user apps(default=no)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1071,9 +1071,6 @@
   --with-pcsclite         Use pcsc-lite (default=yes)
 
 Some influential environment variables:
-  PKG_CONFIG  path to pkg-config utility
-  NSS_CFLAGS  C compiler flags for NSS, overriding pkg-config
-  NSS_LIBS    linker flags for NSS, overriding pkg-config
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1086,8 +1083,11 @@
   CXXCPP      C++ preprocessor
   F77         Fortran 77 compiler command
   FFLAGS      Fortran 77 compiler flags
+  PKG_CONFIG  path to pkg-config utility
   PCSC_CFLAGS C compiler flags for PCSC, overriding pkg-config
   PCSC_LIBS   linker flags for PCSC, overriding pkg-config
+  NSS_CFLAGS  C compiler flags for NSS, overriding pkg-config
+  NSS_LIBS    linker flags for NSS, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2118,8 +2118,8 @@
   	echo "$as_me:$LINENO: result: Windows" >&5
 echo "${ECHO_T}Windows" >&6
 	WINDOWS=1
-	ZLIB_CFLAGS=-Ic:/zlib
-	ZLIB_LIBS=c:/zlib/zlib.dll
+	#ZLIB_CFLAGS=-Ic:/zlib
+	#ZLIB_LIBS=c:/zlib/zlib.dll
 	#OS_FLAGS=`echo $INCLUDE | tr '[[:upper:]]' '[[:lower:]]' | sed -e 's;\\\\;/;g' -e 's;.:;/cygdrive/&/;g' -e 's;:;;g' -e 's;//;/;g' -e 's/;/\" -I\"/g' -e 's;^;-I\";' -e 's;$;\";'`
 	CPPFLAGS="$CPPFLAGS $OS_FLAGS -DWIN32"
 	LDFLAGS="$LDFLAGS"
@@ -2137,8 +2137,11 @@
 	MAC=1
 	SCARD_LIB_NAME="PCSC.Framework/PCSC"
 	PCSC_MSG=yes
-	PCSC_CFLAGS=""
+	PCSC_CFLAGS="-I/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers"
 	PCSC_LIBS="-Wl,-framework,PCSC"
+	CFLAGS="-DMAC  -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+	LDFLAGS="-L/System/Library/Frameworks/Security.framework/Versions/Current/Security -arch ppc -arch i386"
+	CXXFLAGS="-DMAC  -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
 	;;
 *)
   	echo "$as_me:$LINENO: result: UNIX/LINUX" >&5
@@ -2149,201 +2152,6 @@
 	;;
 esac
 
-# Add argument for pk11install
-# Check whether --enable-pk11install or --disable-pk11install was given.
-if test "${enable_pk11install+set}" = set; then
-  enableval="$enable_pk11install"
-
-fi;
-if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true"
-then
-if test $WINDOWS -ne 1; then
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
-if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  PKG_CONFIG=$ac_pt_PKG_CONFIG
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	else
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-		PKG_CONFIG=""
-	fi
-
-fi
-
-pkg_failed=no
-echo "$as_me:$LINENO: checking for NSS" >&5
-echo $ECHO_N "checking for NSS... $ECHO_C" >&6
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$NSS_CFLAGS"; then
-        pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
-  ($PKG_CONFIG --exists --print-errors "nss") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$NSS_LIBS"; then
-        pkg_cv_NSS_LIBS="$NSS_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
-  ($PKG_CONFIG --exists --print-errors "nss") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nss"`
-        else
-	        NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$NSS_PKG_ERRORS" >&5
-
-	 { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5
-echo "$as_me: error: could not find NSS Crypto libraries" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	 { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5
-echo "$as_me: error: could not find NSS Crypto libraries" >&2;}
-   { (exit 1); exit 1; }; }
-else
-	NSS_CFLAGS=$pkg_cv_NSS_CFLAGS
-	NSS_LIBS=$pkg_cv_NSS_LIBS
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	true
-fi
-fi
-  enable_pk11install = "yes"
-else
-  enable_pk11install = "no"
-  { echo "$as_me:$LINENO: WARNING: skipping pk11install" >&5
-echo "$as_me: WARNING: skipping pk11install" >&2;}
-fi
-
 
 # Checks for programs.
 ac_ext=c
@@ -4480,7 +4288,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4483 "configure"' > conftest.$ac_ext
+  echo '#line 4291 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5615,7 +5423,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5618:" \
+echo "$as_me:5426:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6678,11 +6486,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6681: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6489: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6685: \$? = $ac_status" >&5
+   echo "$as_me:6493: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6946,11 +6754,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6949: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6757: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6953: \$? = $ac_status" >&5
+   echo "$as_me:6761: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7050,11 +6858,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7053: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6861: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7057: \$? = $ac_status" >&5
+   echo "$as_me:6865: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8519,7 +8327,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 8522 "configure"' > conftest.$ac_ext
+    echo '#line 8330 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9416,7 +9224,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9419 "configure"
+#line 9227 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9516,7 +9324,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9519 "configure"
+#line 9327 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10741,10 +10549,7 @@
 	echo EXPORTS > $output_objdir/$soname.def;
 	cat $export_symbols >> $output_objdir/$soname.def;
       fi~
-      #
-      # Hack... gcc and lc are quite different, we can use either for cygwin
-      # try to get a line that both are happy with...
-      #
+
       $CC -LD -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker '
     else
       ld_shlibs_CXX=no
@@ -11860,11 +11665,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11863: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11668: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11867: \$? = $ac_status" >&5
+   echo "$as_me:11672: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11964,11 +11769,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11967: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11772: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11971: \$? = $ac_status" >&5
+   echo "$as_me:11776: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12500,7 +12305,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 12503 "configure"' > conftest.$ac_ext
+    echo '#line 12308 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -13555,11 +13360,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13558: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13363: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13562: \$? = $ac_status" >&5
+   echo "$as_me:13367: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13659,11 +13464,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13662: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13467: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13666: \$? = $ac_status" >&5
+   echo "$as_me:13471: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15108,7 +14913,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 15111 "configure"' > conftest.$ac_ext
+    echo '#line 14916 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15883,11 +15688,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15886: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15691: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15890: \$? = $ac_status" >&5
+   echo "$as_me:15695: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16151,11 +15956,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16154: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15959: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16158: \$? = $ac_status" >&5
+   echo "$as_me:15963: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16255,11 +16060,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16258: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16063: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16262: \$? = $ac_status" >&5
+   echo "$as_me:16067: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17724,7 +17529,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17727 "configure"' > conftest.$ac_ext
+    echo '#line 17532 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -19209,6 +19014,111 @@
   with_pcsclite=no
 else
 
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+if test -n "$ac_pt_PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	else
+		echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+		PKG_CONFIG=""
+	fi
+
+fi
+
 pkg_failed=no
 echo "$as_me:$LINENO: checking for PCSC" >&5
 echo $ECHO_N "checking for PCSC... $ECHO_C" >&6
@@ -19297,6 +19207,97 @@
 fi
 fi
 
+# Add argument for pk11install
+# Check whether --enable-pk11install or --disable-pk11install was given.
+if test "${enable_pk11install+set}" = set; then
+  enableval="$enable_pk11install"
+
+fi;
+if test "$enable_pk11install" = "yes" -o "$enable_pk11install" = "true"
+then
+if test $WINDOWS -ne 1; then
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for NSS" >&5
+echo $ECHO_N "checking for NSS... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$NSS_CFLAGS"; then
+        pkg_cv_NSS_CFLAGS="$NSS_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
+  ($PKG_CONFIG --exists --print-errors "nss") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$NSS_LIBS"; then
+        pkg_cv_NSS_LIBS="$NSS_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nss\"") >&5
+  ($PKG_CONFIG --exists --print-errors "nss") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nss"`
+        else
+	        NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$NSS_PKG_ERRORS" >&5
+
+	 { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5
+echo "$as_me: error: could not find NSS Crypto libraries" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	 { { echo "$as_me:$LINENO: error: could not find NSS Crypto libraries" >&5
+echo "$as_me: error: could not find NSS Crypto libraries" >&2;}
+   { (exit 1); exit 1; }; }
+else
+	NSS_CFLAGS=$pkg_cv_NSS_CFLAGS
+	NSS_LIBS=$pkg_cv_NSS_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	true
+fi
+fi
+  enable_pk11install = "yes"
+else
+  enable_pk11install = "no"
+  { echo "$as_me:$LINENO: WARNING: skipping pk11install" >&5
+echo "$as_me: WARNING: skipping pk11install" >&2;}
+fi
+
+
 
 
 
@@ -21598,10 +21599,6 @@
 s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
 s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
 s, at MAINT@,$MAINT,;t t
-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s, at NSS_CFLAGS@,$NSS_CFLAGS,;t t
-s, at NSS_LIBS@,$NSS_LIBS,;t t
 s, at CC@,$CC,;t t
 s, at CFLAGS@,$CFLAGS,;t t
 s, at LDFLAGS@,$LDFLAGS,;t t
@@ -21638,8 +21635,12 @@
 s, at ac_ct_F77@,$ac_ct_F77,;t t
 s, at LIBTOOL@,$LIBTOOL,;t t
 s, at LIBCKYAPPLET@,$LIBCKYAPPLET,;t t
+s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s, at PCSC_CFLAGS@,$PCSC_CFLAGS,;t t
 s, at PCSC_LIBS@,$PCSC_LIBS,;t t
+s, at NSS_CFLAGS@,$NSS_CFLAGS,;t t
+s, at NSS_LIBS@,$NSS_LIBS,;t t
 s, at ZLIB_CFLAGS@,$ZLIB_CFLAGS,;t t
 s, at ZLIB_LIBS@,$ZLIB_LIBS,;t t
 s, at SCARD_LIB_NAME@,$SCARD_LIB_NAME,;t t


Index: config.status
===================================================================
RCS file: /cvs/dirsec/coolkey/config.status,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config.status	13 Oct 2006 01:16:20 -0000	1.6
+++ config.status	9 Feb 2007 18:47:42 -0000	1.7
@@ -304,7 +304,7 @@
 ac_cs_version="\
 coolkey config.status "1.1.0"
 configured by configure, generated by GNU Autoconf 2.59,
-  with options \"\"
+  with options \"'--enable-pk11install'\"
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -383,8 +383,8 @@
 fi
 
 if $ac_cs_recheck; then
-  echo "running /bin/sh configure "  $ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec /bin/sh configure  $ac_configure_extra_args --no-create --no-recursion
+  echo "running /bin/sh configure " '--enable-pk11install' $ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec /bin/sh configure '--enable-pk11install' $ac_configure_extra_args --no-create --no-recursion
 fi
 
 #
@@ -558,18 +558,20 @@
 s, at FFLAGS@,,;t t
 s, at ac_ct_F77@,,;t t
 s, at LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t
+s, at LIBCKYAPPLET@,${top_builddir}/src/libckyapplet/libckyapplet.la,;t t
 s, at PKG_CONFIG@,/usr/bin/pkg-config,;t t
 s, at ac_pt_PKG_CONFIG@,/usr/bin/pkg-config,;t t
-s, at NSS_CFLAGS@,-I/usr/include/nss3 -I/usr/include/nspr4  ,;t t
-s, at NSS_LIBS@,-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl  ,;t t
-s, at LIBCKYAPPLET@,${top_builddir}/src/libckyapplet/libckyapplet.la,;t t
 s, at PCSC_CFLAGS@,-pthread -I/usr/include/PCSC  ,;t t
 s, at PCSC_LIBS@,-lpcsclite  ,;t t
+s, at NSS_CFLAGS@,-I/usr/include/nss3 -I/usr/include/nspr4  ,;t t
+s, at NSS_LIBS@,-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl  ,;t t
 s, at ZLIB_CFLAGS@,,;t t
 s, at ZLIB_LIBS@,,;t t
 s, at SCARD_LIB_NAME@,libpcsclite.so.1,;t t
 s, at HAVE_PCSC_TRUE@,,;t t
 s, at HAVE_PCSC_FALSE@,#,;t t
+s, at BUILD_PK11INSTALL_TRUE@,,;t t
+s, at BUILD_PK11INSTALL_FALSE@,#,;t t
 s, at LIBOBJS@,,;t t
 s, at LTLIBOBJS@,,;t t
 CEOF



From fedora-directory-commits at redhat.com  Fri Feb  9 18:53:23 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri,  9 Feb 2007 13:53:23 -0500
Subject: [Fedora-directory-commits] coolkey/src/coolkey object.cpp,1.1,1.2
Message-ID: <200702091853.l19IrNO2022453@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22388

Modified Files:
	object.cpp 
Log Message:


CK_ULONG is platform dependent, where the number of bytes used to store a 
CK_ULONG in the token is not. 



Index: object.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/object.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- object.cpp	9 Jun 2006 18:39:11 -0000	1.1
+++ object.cpp	9 Feb 2007 18:53:21 -0000	1.2
@@ -105,7 +105,9 @@
 	if ((attrib.getType() == CKA_CLASS) || 
 	    (attrib.getType() == CKA_CERTIFICATE_TYPE) ||
 	    (attrib.getType() == CKA_KEY_TYPE)) {
-	    if (attrLen != sizeof (CK_ULONG)) {
+	    /* ulongs are 4 bytes on the token, even if they are 8 or
+	     * more in the pkcs11 module */
+	    if (attrLen != 4) {
                 throw PKCS11Exception(CKR_DEVICE_ERROR,
                 "Invalid attribute length %d\n", attrLen);
 	    }
@@ -183,7 +185,7 @@
     if (!attributeExists(CKA_CLASS)) {
 	PKCS11Attribute attrib;
 	attrib.setType(CKA_CLASS);
-	attrib.setValue((CKYByte *)&objectType, 4);
+	attrib.setValue((CKYByte *)&objectType, sizeof(CK_ULONG));
         attributes.push_back(attrib);
     }
 



From fedora-directory-commits at redhat.com  Fri Feb  9 21:33:42 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:33:42 -0500
Subject: [Fedora-directory-commits] esc/src/xulrunner Makefile,1.4,1.5
Message-ID: <200702092133.l19LXgoJ001265@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/xulrunner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1249

Modified Files:
	Makefile 
Log Message:
Add flag to control whether or not to build with the system NSS and NSPR for Linux.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	25 Jan 2007 22:37:42 -0000	1.4
+++ Makefile	9 Feb 2007 21:33:40 -0000	1.5
@@ -67,9 +67,11 @@
 	echo "ac_add_options --enable-default-toolkit=gtk2" >> $@.$(TYPE)
 	echo "ac_add_options --enable-xft" >> $@.$(TYPE)
 	echo "ac_add_options --disable-freetype2" >> $@.$(TYPE)
+ifndef NO_SYSTEM_NSS 
 	echo "ac_add_options --with-system-nspr" >> $@.$(TYPE)
 	echo "ac_add_options --with-system-nss" >> $@.$(TYPE)
 endif
+endif
 ifeq ($(OS_ARCH),Darwin)
 	echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE)
 	echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE)



From fedora-directory-commits at redhat.com  Fri Feb  9 21:35:02 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:35:02 -0500
Subject: [Fedora-directory-commits] esc/src/app/xpcom Makefile.moz,1.6,1.7
Message-ID: <200702092135.l19LZ2W0001307@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1288

Modified Files:
	Makefile.moz 
Log Message:
Cleanup linker flags.



Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.moz,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.moz	2 Feb 2007 22:13:54 -0000	1.6
+++ Makefile.moz	9 Feb 2007 21:35:00 -0000	1.7
@@ -80,7 +80,7 @@
 TESTCPPSRCS	= CoolKeyCSP.cpp
 MOZ_NO_DEBUG_RTL=1
 else
-COOLKEY_LIBS	= -L$(CORE_DIST)/lib  -lhttpchunked -lckymanager  $(CKY_LIB_LDD) -lckyapplet
+COOLKEY_LIBS	= -L$(CORE_DIST)/lib  -lckymanager  -lhttpchunked $(CKY_LIB_LDD) -lckyapplet
 endif
 
 ifeq ($(OS_ARCH),Darwin)



From fedora-directory-commits at redhat.com  Fri Feb  9 21:36:50 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:36:50 -0500
Subject: [Fedora-directory-commits] esc/src/app/xpcom rhCoolKey.cpp,1.4,1.5
Message-ID: <200702092136.l19LaouA001351@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1334

Modified Files:
	rhCoolKey.cpp 
Log Message:
Add method to get card's ATR.



Index: rhCoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhCoolKey.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rhCoolKey.cpp	25 Oct 2006 03:58:16 -0000	1.4
+++ rhCoolKey.cpp	9 Feb 2007 21:36:47 -0000	1.5
@@ -1167,6 +1167,21 @@
     return NS_OK;
 }
 
+/* string GetCoolKeyATR (in unsigned long aKeyType, in string aKeyID); */
+  NS_IMETHODIMP rhCoolKey::GetCoolKeyATR(PRUint32 aKeyType, const char *aKeyID, char **_retval)
+  {
+     *_retval  = NULL;
+    AutoCoolKey key(aKeyType, aKeyID);
+    char atr[128];
+    HRESULT res =   CoolKeyGetATR(&key, (char *)&atr,sizeof(atr));
+     PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Attempting to get the key's ATR: Key: %s, ATR  %s. \n",aKeyID, (char *) atr));
+    if(res == S_OK)
+    {
+        char *temp =  (char *) nsMemory::Clone(atr,sizeof(char) * strlen((char *)atr) + 1);
+        *_retval  = temp;
+    }
+      return NS_OK;
+  }
 
 /* string GetCoolKeyIssuerInfo (in unsigned long aKeyType, in string aKeyID); */  NS_IMETHODIMP rhCoolKey::GetCoolKeyIssuerInfo(PRUint32 aKeyType, const char *aKeyID, char **_retval)
   {



From fedora-directory-commits at redhat.com  Fri Feb  9 21:37:35 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:37:35 -0500
Subject: [Fedora-directory-commits] esc/src/app/xpcom rhICoolKey.idl, 1.3,
	1.4
Message-ID: <200702092137.l19LbZPK001382@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1366

Modified Files:
	rhICoolKey.idl 
Log Message:
Add method to get card's ATR.



Index: rhICoolKey.idl
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhICoolKey.idl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rhICoolKey.idl	27 Sep 2006 17:22:20 -0000	1.3
+++ rhICoolKey.idl	9 Feb 2007 21:37:33 -0000	1.4
@@ -65,6 +65,8 @@
 
     string GetCoolKeyIssuedTo(in unsigned long aKeyType, in string aKeyID);
 
+    string GetCoolKeyATR(in unsigned long aKeyType, in string aKeyID);
+
     boolean GetCoolKeyRequiresAuthentication(in unsigned long aKeyType,in string aKeyID);
 
     boolean GetCoolKeyIsAuthenticated(in unsigned long aKeyType,in string aKeyID);



From fedora-directory-commits at redhat.com  Fri Feb  9 21:39:25 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:39:25 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	settings.xul, 1.4, 1.5
Message-ID: <200702092139.l19LdPAw001416@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1400

Modified Files:
	settings.xul 
Log Message:
Send parameter to function that format's the card.



Index: settings.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/settings.xul,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- settings.xul	25 Oct 2006 04:03:35 -0000	1.4
+++ settings.xul	9 Feb 2007 21:39:22 -0000	1.5
@@ -132,7 +132,7 @@
                           <spacer class="verticalSpacer"/>
                       </description>
 
-                          <button class="buttonText" id="formatbtn" label="&doFormat;" oncommand="DoFormatCoolKey()" disabled="true" hidden = "false"/>
+                          <button class="buttonText" id="formatbtn" label="&doFormat;" oncommand="DoFormatCoolKey('userKey')" disabled="true" hidden = "false"/>
 
                           <button class="buttonText" id="enrollbtn" label="&doEnroll;" oncommand="DoCollectPassword('enroll');" disabled="true" hidden="false"/>
 



From fedora-directory-commits at redhat.com  Fri Feb  9 21:42:21 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:42:21 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	esc.xul, 1.4, 1.5
Message-ID: <200702092142.l19LgL5E001510@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1494

Modified Files:
	esc.xul 
Log Message:
Cleanup.



Index: esc.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.xul,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- esc.xul	25 Oct 2006 04:03:35 -0000	1.4
+++ esc.xul	9 Feb 2007 21:42:19 -0000	1.5
@@ -32,12 +32,6 @@
   <stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
   <script src= "TRAY.js"/>
   <script src="ESC.js"/> 
-  <tabbox id="tablist" hidden="true">
-      <tabs>
-      <tab label="Settings" oncommand="loadSETTINGS();"/>
-      <tab label="Configuration" oncommand="loadCONFIG();"/>
-     </tabs>
-  </tabbox>
   <vbox flex ="1"  >
       <hbox class="logoBox" >
           <image id="logoImage"/>



From fedora-directory-commits at redhat.com  Fri Feb  9 21:46:49 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:46:49 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	esc.css, 1.3, 1.4
Message-ID: <200702092146.l19Lkne4001596@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1579

Modified Files:
	esc.css 
Log Message:
Add entry for short Iframe.



Index: esc.css
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esc.css	27 Sep 2006 17:31:51 -0000	1.3
+++ esc.css	9 Feb 2007 21:46:47 -0000	1.4
@@ -328,6 +328,12 @@
     border: black solid 4px;
 }
 
+.BorderedIFrameShort {
+   width: 600px;
+   height: 500px;
+   border: black solid 4px;
+}
+
 .SelectedRow {
 
     color: white;



From fedora-directory-commits at redhat.com  Fri Feb  9 21:48:09 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:48:09 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	ESC.js, 1.5, 1.6
Message-ID: <200702092148.l19Lm9im001637@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1619

Modified Files:
	ESC.js 
Log Message:
Add initial support for security mode. Cleanup.



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 ESC.js
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ESC.js	30 Nov 2006 18:33:19 -0000	1.5
+++ ESC.js	9 Feb 2007 21:48:07 -0000	1.6
@@ -26,10 +26,8 @@
 
 var gEnrollmentPage = 0;
 var gAdminPage = 0;
-var gUsesListBox = 0;
 var gFactoryMode = 0;
 var gHiddenPage = 0;
-var gHiddenPageDone = 0;
 var gExternalUI = 0;
 
 loadStringBundle();
@@ -44,11 +42,16 @@
 const  ISSUER_TAG        = "IssuerName"; 
 const  SERVICE_INFO_TAG  = "ServiceInfo";
 const  ENROLLED_TOKEN_BROWSER_URL = "EnrolledTokenBrowserURL";
+const  ENROLLED_TOKEN_URL = "EnrolledTokenURL";
+const  TOKEN_TYPE = "TokenType";
 const  RESET_PHONE_HOME  = "ResetPhoneHome";
 const  ESC_IGNORE_TOKEN_BROWSER_URL = "esc.ignore.token.browser.url";
 const  ESC_TOKEN_BROWSER_URL_ESTABLISHED = "esc.token.browser.established";
 const  ESC_IGNORE_KEY_ISSUER_INFO = "esc.ignore.key.issuer.info";
+const  ESC_FACE_TO_FACE_MODE = "esc.face.to.face.mode";
+const  ESC_SECURITY_URL="esc.security.url";
 
+const  CLEAN_TOKEN = "cleanToken";
 const  UNINITIALIZED        = 1;
 const  UNINITIALIZED_NOAPPLET = 2;
 const  ESC_ENROLL_WIDTH  = 600;
@@ -61,13 +64,11 @@
 const WIN_XP_PROG_OPEN = "C:\\Windows\\system32\\cmd.exe";
 const WIN_2000_PROG_OPEN = "C:\\WINNT\\system32\\cmd.exe";
 
-
 //Window names
-
 const ENROLL_WINDOW      = "esc.xul";
 const ADMIN_WINDOW       = "settings.xul";
 const HIDDEN_WINDOW      = "hiddenWindow.xul";
-
+const SECURITY_WINDOW    = "security.xul";
 
 function getUIForKey(aKeyID)
 {
@@ -93,7 +94,7 @@
 
   QueryInterface: function(iid)
   {
-    <!--  alert("iid: " + iid); -->
+     //  alert("iid: " + iid); 
      if(!iid.equals(Components.interfaces.rhIKeyNotify) &&
          !iid.equals(Components.interfaces.nsISupports))
       {
@@ -107,6 +108,8 @@
 //
 // Attach to the object.
 //
+  var gNotify=null;
+
   try {
     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     netkey = Components.classes["@redhat.com/rhCoolKey"].getService();
@@ -122,7 +125,6 @@
 //
 function cleanup()
 {
-
     TrayRemoveWindow(null);
     try {
       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -133,12 +135,10 @@
 
 }
 
-var gScreenName = "";
 var gKeyEnrollmentType = "userKey";
 
 var gCurrentSelectedRow = null;
 
-
 var gCurKeyType = null;
 var gCurKeyID = null;
 
@@ -202,35 +202,6 @@
     getBundleString("errorESCNoTalkTokenReader")
 );
 
-//silent set of the tps uri connection on startup
-
-function testTPSURISilent()
-
-{
-
-   var tps_uri = null;
-
-   if(netkey)
-   {
-      try {
-            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-            tps_uri = netkey.GetCoolKeyConfigValue("esc.tps.url");
-
-
-            } catch(e) {
-                MyAlert(getBundleString("errorConfigValue")  + e);
-            }
-
-        if(tps_uri)
-        {
-            testTPSURI(tps_uri);
-
-        }
-    }
-
-}
-
 // Main function that oversees obtaining Phone Home Info from the Server
 
 function DoPhoneHome(keyType,keyID)
@@ -247,19 +218,14 @@
             issuer = getBundleString("unknownIssuer");
         TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
         UpdateRowWithPhoneHomeData(keyType,keyID);
-
         recordMessage("cached issuer " + issuer);
-
         var browserURL =  GetCachedEnrolledTokenBrowserURL(keyID);
-
         recordMessage("Cached browserURL " + browserURL);
 
         if(browserURL)
         {
             DoCoolKeySetConfigValue(ESC_TOKEN_BROWSER_URL_ESTABLISHED,"yes");
-
             DoHandleEnrolledBrowserLaunch();
-
         }
 
     }
@@ -267,12 +233,20 @@
     {
         issuer = getBundleString("unknownIssuer");
         TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
-        //launchCONFIG(keyType,keyID);
     }
   }
 
-  if(IsPhoneHomeCached(keyID))
+  recordMessage("Attempting phone home...");
+
+  var home = DoCoolKeyGetIssuerUrl(keyType,keyID);
+
+  recordMessage("Returned IssuerURL " + home);
+
+  if(IsPhoneHomeCached(keyID) && home)
   {
+      var phoneHomeURI = GetCachedPhoneHomeURL(keyID);
+
+      recordMessage("Phone home info cached...");
       issuer = GetCachedIssuer(keyID);
       TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
 
@@ -287,17 +261,18 @@
       return true;
   }
 
-  var home = DoCoolKeyGetIssuerUrl(keyType,keyID);
 
   var homeRes = false;
 
   if(home)
   {
+      recordMessage("About to actually phone home for real...");
       homeRes =  phoneHome(home,keyID,callback);
   }
 
   if(!home)
   {
+      recordMessage("About to launch CONFIG , non secmode...");
       launchCONFIG(keyType,keyID);
   }
 
@@ -329,7 +304,6 @@
     {
         MyAlert(getBundleString("noTpsConfigUrl"));
         return;
-
     }
 
     if(!url.value)
@@ -348,12 +322,10 @@
     {
         MyAlert(getBundleString("tpsConfigError"));
[...2480 lines suppressed...]
 
     phoneHomeIssuer = GetCachedIssuer(aKeyID);
 
-
     if(!phoneHomeIssuer)
        return false;
 
     tpsURL = GetCachedTPSURL(aKeyID);
 
-
     if(!tpsURL)
         return false;
     tpsUI = GetCachedTPSUI(aKeyID);
 
-
     return true;
 }
 
@@ -4281,7 +3556,6 @@
 
      var theValue = ConfigValueWithKeyID(aKeyID,aValue);
 
-
      if(!theValue)
          return null;
 
@@ -4290,9 +3564,17 @@
      return retValue;
 }
 
-function GetCachedEnrolledTokenBrowserURL(aKeyID)
+function GetCachedTokenType(aKeyID)
 {
+    return GetCachedPhoneHomeValue(aKeyID,TOKEN_TYPE);
+}
 
+function GetCachedEnrolledTokenURL(aKeyID)
+{
+    return GetCachedPhoneHomeValue(aKeyID,ENROLLED_TOKEN_URL);
+}
+function GetCachedEnrolledTokenBrowserURL(aKeyID)
+{
      return GetCachedPhoneHomeValue(aKeyID,ENROLLED_TOKEN_BROWSER_URL);
 }
 
@@ -4305,7 +3587,6 @@
 
      var urlValue = ConfigValueWithKeyID(aKeyID,KEY_ISSUER_URL);
 
-
      if(!urlValue)
          return null;
 
@@ -4356,7 +3637,6 @@
 
      var urlValue = ConfigValueWithKeyID(aKeyID,TPS_URL);
 
-
      if(!urlValue)
          return null;
 
@@ -4365,9 +3645,9 @@
      return url;
 }
 
+//Update display when phone home data comes in
 function UpdateRowWithPhoneHomeData(keyType,keyID)
 {
-
     if(gEnrollmentPage)
     {
         UpdateEnrollmentArea(keyType,keyID,1);
@@ -4378,10 +3658,9 @@
           SelectRowByKeyID(keyType, keyID);
           UpdateAdminListRow(keyType,keyID);
     }
-
 }
 
-//Phone home and get values
+//Phone home and actually get data values
 function phoneHome(theUrl,aKeyID,resultCB)
 {
 
@@ -4457,8 +3736,17 @@
             for (var i = 0; i < len; i++)
             {
                 var oChild = servicesNodes.item(i);
-                var name = oChild.nodeName;
-                var value = oChild.firstChild.data;
+                
+                var name=null;
+                var value = null;
+                if(oChild)
+                {
+                   name = oChild.nodeName;
+
+                   if(oChild.firstChild)
+                       value = oChild.firstChild.data;
+
+                }
 
                 if(name && value)
                 {
@@ -4474,9 +3762,7 @@
             }
 
             recordMessage("Done writing out phone home config cache.");
-
             var browserURL =  GetCachedEnrolledTokenBrowserURL(aKeyID);
-
             recordMessage("Cached browserURL " + browserURL);
 
             if(browserURL)
@@ -4495,7 +3781,7 @@
                 var result = DoCoolKeySetConfigValue(issuer_config_value,url);
                 resultCB(true);
             }
-            return;
+            return true;
         }
      }
 
@@ -4507,7 +3793,6 @@
 
 function ReadESCLog()
 {
-
     const logFileName = "esc.log";
 
     // Get executable directory
@@ -4529,7 +3814,6 @@
 
         return null;
     }
-
    // read lines into array
     var line = {}, lines = [], hasmore;
     do {
@@ -4609,7 +3893,6 @@
 
 function DoMyAlert(message,title)
 {
-
    if(!message || !title)
        return;     try {
         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -4619,13 +3902,10 @@
 
    } catch(e) {
 
-
        alert("Problem with nsIPromptService " + e);
    }
-
 }
 
-
 //Utility function to sleep for a short time
 
 function Sleep(milliSeconds)
@@ -4633,26 +3913,20 @@
     var then = new Date(new Date().getTime() + milliSeconds ); while (new Date() < then) {}
 }
 
-
 function DoCopyAdvancedInfoToClipBoard()
 {
     var textinfo = window.document.getElementById("advanced-info");
 
-
     CopyDataToClipboard(gDiagnosticsDataText);
 }
 
-
 function CopyDataToClipboard(aDataText)
 {
-
    if(!aDataText)
-       return;
-
+       return false;
 
     var str = Components.classes["@mozilla.org/supports-string;1"].createInstance(Components.interfaces.nsISupportsString); 
 
-
     if (!str) 
        return false; 
 
@@ -4674,8 +3948,10 @@
     clip.setData(trans,null,clipid.kGlobalClipboard);
     MyAlert(getBundleString("dataCopiedToClipboard") );
 
+    return true;
 }
 
+//Write message to Javascript console if open
 
 function recordMessage( message ) {
 



From fedora-directory-commits at redhat.com  Fri Feb  9 21:49:06 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:49:06 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	security.xul, NONE, 1.1
Message-ID: <200702092149.l19Ln6UL001670@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1655

Added Files:
	security.xul 
Log Message:
Initial revision.



--- NEW FILE security.xul ---
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/"  type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
 * 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; version 2 of the License.
 *
 * 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., 59 Temple
 * Place, Suite 330, Boston, MA 02111-1307 USA.
 *
 * Copyright (C) 2005 Red Hat, Inc.
 * All rights reserved.
 ***** END COPYRIGHT BLOCK ***** -->

<!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
<window 
    class="escwindow"
    id="esc-window"
    title="&escTitle;"
    onload="InitializeSecurityEnrollment()"
    width ="600"
    height= "575"
    onunload="cleanup();OnSecurityPageHidden();"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

  <stringbundle id="esc_strings" src="chrome://esc/locale/esc.properties"/>
  <script src= "TRAY.js"/>
  <script src="ESC.js"/> 

  <groupbox flex="1">
  <iframe id="security-ui"  flex="3" class="BorderedIFrameShort" />
  </groupbox>
  <hbox >
        <spacer flex="3"/>
        <button id="closebtn" label ="&closeNow;" oncommand="window.close();"/>
  </hbox>
</window>



From fedora-directory-commits at redhat.com  Fri Feb  9 21:51:43 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:51:43 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	certinfo.xul, 1.3, NONE
Message-ID: <200702092151.l19LphLJ001801@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1787

Removed Files:
	certinfo.xul 
Log Message:
Cleanup.



--- certinfo.xul DELETED ---



From fedora-directory-commits at redhat.com  Fri Feb  9 21:52:41 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:52:41 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	esc_browser.xul, 1.2, NONE
Message-ID: <200702092152.l19Lqf78001831@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1817

Removed Files:
	esc_browser.xul 
Log Message:
Cleanup.



--- esc_browser.xul DELETED ---



From fedora-directory-commits at redhat.com  Fri Feb  9 21:54:24 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:54:24 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/locale/en-US
	esc.dtd, 1.4, 1.5 esc.properties, 1.3, 1.4
Message-ID: <200702092154.l19LsOwg001880@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1861

Modified Files:
	esc.dtd esc.properties 
Log Message:
Support for security mode.


Index: esc.dtd
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- esc.dtd	25 Oct 2006 04:04:47 -0000	1.4
+++ esc.dtd	9 Feb 2007 21:54:22 -0000	1.5
@@ -70,6 +70,7 @@
 <!ENTITY closeNow "Close">
 <!ENTITY enrollKeyNow "Enroll My Smart Card Now">
 <!ENTITY enrollKey "Enroll Smart Card">
+<!ENTITY enrollKeyNowGeneric "Continue">
 <!ENTITY administerKeys "Manage Smart Cards">
 <!ENTITY administerMessage "This tool helps you manage your smart cards and to examine their contents when you are having problems. To manage your smart cards, you must connect them to the computer.">
 <!ENTITY blankKeyLabel "Blank Key">


Index: esc.properties
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US/esc.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esc.properties	27 Sep 2006 17:45:14 -0000	1.3
+++ esc.properties	9 Feb 2007 21:54:22 -0000	1.4
@@ -44,6 +44,7 @@
 tpsPhoneHomeURL=Phone Home URL:
 status=Status:
 issuer=Issuer:
+atr=Atr:
 escLogEntries=Smart Card Activity
 noLogFileOrData=No log file or log file has no data.
 dataCopiedToClipboard=Diagnostics information copied to the clipboard.
@@ -63,6 +64,7 @@
 coolkeyDetectedNumberKeys=Number of Smart Cards Detected:
 enrolledDetected=Enrolled Smart Card Detected
 enrolledDetectedMessage=Smart Card Manager has detected an already enrolled card. If you do not wish to re-enroll, press the "Close" button.
+enrolledDetectedMessageGeneric=Smart Card Manager has detected an already enrolled card. Click Proceed to continue.
 unenrolledDetectedMessage=Smart Card Manager has detected that you have entered a new and un-enrolled smart card. Before you can use this smart card, you have to enroll it.  Enrolling your smart card personalizes it so only you can use it for secure operations.
 enrollAnyway=If you would like to re-enroll anyway, click  Enroll My Smart Card Now.
 readyToProceed=When you are ready to begin the process,click  Enroll My Smart Card Now.
@@ -164,6 +166,7 @@
 errorSelectKey=Please select a smart card.
 errorEnrolledFirst=Smart card must be enrolled first! Enroll card and try again.
 enrollmentFor=Enrollment for
+errorNeedKeyForSecMode=Please insert enrolled smart card before attempting secure mode.
 wasSuccessful=was successful.
 pinResetSuccessful=Password Reset was successfull!
 formatOf=Format of



From fedora-directory-commits at redhat.com  Fri Feb  9 21:55:33 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:55:33 -0500
Subject: [Fedora-directory-commits] 
	esc/src/app/xul/esc/components escCLH.js, 1.1, 1.2
Message-ID: <200702092155.l19LtXZZ001913@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/components
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1893

Modified Files:
	escCLH.js 
Log Message:
Add support for security mode.



Index: escCLH.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/components/escCLH.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- escCLH.js	13 Sep 2006 17:52:38 -0000	1.1
+++ escCLH.js	9 Feb 2007 21:55:31 -0000	1.2
@@ -48,10 +48,36 @@
            var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
            var win = wm.getMostRecentWindow(null);
 
+           var doSecMode = false;
+           var secModeURL=null;
+
+           secModeURL = cmdLine.handleFlagWithParam("secmode",false);
+           if (secModeURL) {
+               doSecMode = true;
+               cmdLine.preventDefault = true;
+           }
+
            if(win)
            {
-               recordMessage("Subsequent invocation. Launch an Admin page.");
-               win.launchSETTINGS();
+               recordMessage("Subsequent command invocation. Launch appropriate  page.");
+
+               var locName = win.location.toString();
+
+               recordMessage("Base window . " + locName);
+
+               if(doSecMode)
+               {
+
+                  var uri = cmdLine.resolveURI(secModeURL);
+                  recordMessage("Attempting security mode. url: " + secModeURL);
+                  win.launchESCSecMode(secModeURL);
+               }
+               else
+               {
+                   win.launchSETTINGS();
+               }
+
+               recordMessage("Done command line handling...");
                return;
            }
            
@@ -59,11 +85,12 @@
 
            recordMessage(chromeURI);
 
-
            var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
                          .getService(nsIWindowWatcher);
-           wwatch.openWindow(null, chromeURI, "_blank",
+           win = wwatch.openWindow(null, chromeURI, "_blank",
                      "chrome,dialog,height=-1,width=-1,popup=yes", cmdLine);
+
+
        }
        catch(e) {}
 



From fedora-directory-commits at redhat.com  Fri Feb  9 21:56:38 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 16:56:38 -0500
Subject: [Fedora-directory-commits] 
	esc/src/lib/NssHttpClient engine.cpp, 1.2, 1.3
Message-ID: <200702092156.l19Luc1E001943@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/NssHttpClient
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1926

Modified Files:
	engine.cpp 
Log Message:
Get client auth working.



Index: engine.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/engine.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- engine.cpp	27 Sep 2006 17:49:21 -0000	1.2
+++ engine.cpp	9 Feb 2007 21:56:36 -0000	1.3
@@ -284,7 +284,8 @@
     char *                localNickName = (char *)arg;
 
     proto_win = SSL_RevealPinArg(socket);
-   
+  
+ 
     if (localNickName) {
       
      cert = PK11_FindCertFromNickname(localNickName, proto_win);
@@ -342,8 +343,11 @@
 
         if (names != NULL) {
             for( i=0; i < names->numnicknames; i++ ) {
-                cert = PK11_FindCertFromNickname(names->nicknames[i],
-                                                 proto_win);
+
+
+                cert = CERT_FindUserCertByUsage(CERT_GetDefaultCertDB(),names->nicknames[i],certUsageSSLClient,PR_FALSE,proto_win);
+
+
                 if (!cert) {
                     continue;
                 }
@@ -456,7 +460,7 @@
             return NULL;
         }
 
-        //SSL_SetPKCS11PinArg (sock,password);
+        SSL_SetPKCS11PinArg (sock,0);
 
         int error = 0;
         PRBool rv = SSL_OptionSet(sock, SSL_SECURITY, 1);



From fedora-directory-commits at redhat.com  Fri Feb  9 22:00:39 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 17:00:39 -0500
Subject: [Fedora-directory-commits] esc/src/lib/coolkey CoolKey.cpp, 1.3,
	1.4 CoolKey.h, 1.2, 1.3
Message-ID: <200702092200.l19M0d8O002001@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1983

Modified Files:
	CoolKey.cpp CoolKey.h 
Log Message:
Add support to get card ATR.


Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoolKey.cpp	17 Jan 2007 19:11:59 -0000	1.3
+++ CoolKey.cpp	9 Feb 2007 22:00:37 -0000	1.4
@@ -51,7 +51,8 @@
 COOLKEY_API HRESULT CoolKeyInit(const char *aAppDir)
 {
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit:\n appDir %s",aAppDir));
+  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit: appDir %s \n",aAppDir));
+
   if (g_NSSManager) 
   {
     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit:g_NSSManager already exists. \n"));
@@ -80,6 +81,7 @@
 
 COOLKEY_API HRESULT CoolKeyShutdown()
 { 
+
   PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyShutdown:\n"));
 
   DestroyCoolKeyList();
@@ -112,7 +114,14 @@
    g_SetConfigValue = setconfigvalue;
 
 
-   PK11_SetPasswordFunc( CoolKeyVerifyPassword);
+
+   char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.disable.password.prompt");
+
+
+   if(suppressPINPrompt && !strcmp(suppressPINPrompt,"yes"))
+   {
+       PK11_SetPasswordFunc( CoolKeyVerifyPassword);
+   }
    // Set the verify password callback here, no params needed we know what it is
    return 0;
 }
@@ -840,8 +849,35 @@
     return NSSManager::GetKeyIssuedTo(aKey,aBuf,aBufLength);
 
 }
+
+HRESULT CoolKeyGetATR(const CoolKey *aKey, char *aBuf, int aBufLen)
+{
+
+    if (!aKey || !aKey->mKeyID || !aBuf || aBufLen < 1)
+         return E_FAIL;
+    aBuf[0] = 0;
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetATR::\n"));
+
+    HRESULT result = S_OK;
+
+    const char *atr = GetATRForKeyID(aKey);
+
+    if(!atr)
+        return result;
+
+    if((int) strlen(atr) < aBufLen)
+    {
+
+        sprintf(aBuf,"%s",(char *) atr);
+    }
+
+    return result;
+
+}
+
 HRESULT CoolKeyGetIssuerInfo(const CoolKey *aKey, char *aBuf, int aBufLen)
 {
+
      if (!aKey || !aKey->mKeyID || !aBuf || aBufLen < 1)
          return E_FAIL;
 
@@ -860,11 +896,9 @@
 
     HRESULT result = S_OK;
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardCreate_Context.\n"));
 
     CKYCardContext *cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
 
-     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardCreate_Context. \n"));
      assert(cardCtxt);
     if (!cardCtxt) {
       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Context !.\n"));
@@ -872,9 +906,7 @@
       goto done;
     }
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardConnection_Create.\n"));
     conn = CKYCardConnection_Create(cardCtxt);
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardConnection_Create.\n"));
     assert(conn);
     if (!conn) {
       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't create Card Connection!\n"));
@@ -882,9 +914,7 @@
       goto done;
     }
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before GetReaderNameForKeyID.\n"));
     readerName = GetReaderNameForKeyID(aKey);
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After GetReaderNameForKeyID.\n"));
     assert(readerName);
     if (!readerName) {
       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't get reader name!\n"));
@@ -892,9 +922,7 @@
       goto done;
     }
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardConnection_Connect.\n"));
     status = CKYCardConnection_Connect(conn, readerName);
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardConnection_Connect.\n"));
     if (status != CKYSUCCESS) {
       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't connect to Card!\n"));
 
@@ -902,25 +930,20 @@
       goto done;
     }
 
-    #ifndef DARWIN
-    CKYCardConnection_BeginTransaction(conn);
-    #endif
+#ifndef DARWIN
+CKYCardConnection_BeginTransaction(conn);
+#endif
     apduRC = 0;
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYApplet_SelectCoolKeyManager.\n"));
     status = CKYApplet_SelectCoolKeyManager(conn, &apduRC);
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYApplet_SelectCoolKeyManager.\n"));
     if (status != CKYSUCCESS) {
 
       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't select CoolKey manager!\n"));
       goto done;
     }
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYApplet_GetIssuerInfo.\n"));
     status = CKYApplet_GetIssuerInfo(conn, &ISSUER_INFO,
                         &apduRC);
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYApplet_GetIssuerInfo.\n"));
-
     if(status != CKYSUCCESS)
     {
         PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Error actually getting IssuerInfo!\n"));
@@ -956,9 +979,9 @@
     done:
 
     if (conn) {
-      #ifndef DARWIN
+#ifndef DARWIN
       CKYCardConnection_EndTransaction(conn);
-      #endif
+#endif
       CKYCardConnection_Disconnect(conn);
       CKYCardConnection_Destroy(conn);
     }


Index: CoolKey.h
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoolKey.h	27 Sep 2006 17:47:46 -0000	1.2
+++ CoolKey.h	9 Feb 2007 22:00:37 -0000	1.3
@@ -26,10 +26,8 @@
 // platforms (coreconf will do the appropriate processing.
 #define COOLKEY_API
 
-
 #include <string.h>
 #include <stdlib.h>
-
 #include <vector>
 #include <string>
 
@@ -172,6 +170,9 @@
 
 COOLKEY_API HRESULT CoolKeyGetIssuerInfo(const CoolKey *aKey, char *aBuf, int aBufLen);
 
+COOLKEY_API HRESULT CoolKeyGetATR(const CoolKey *aKey, char *aBuf, int aBufLen);
+
+
 COOLKEY_API int CoolKeyGetAppletVer(const CoolKey *aKey, const bool isMajor);
 
 }



From fedora-directory-commits at redhat.com  Fri Feb  9 22:07:18 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri,  9 Feb 2007 17:07:18 -0500
Subject: [Fedora-directory-commits] 
	esc/src/app/xul/esc/defaults/preferences esc-prefs.js, 1.3, 1.4
Message-ID: <200702092207.l19M7IL4005428@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/defaults/preferences
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5412

Modified Files:
	esc-prefs.js 
Log Message:
Add pref that controls the ability to disable or enable the mozilla password prompt.



Index: esc-prefs.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/defaults/preferences/esc-prefs.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esc-prefs.js	25 Oct 2006 04:01:59 -0000	1.3
+++ esc-prefs.js	9 Feb 2007 22:07:16 -0000	1.4
@@ -29,3 +29,4 @@
 pref("esc.show.tabs.ui","no");
 
 pref("esc.windows.do.capi","yes");
+pref("esc.disable.password.prompt","no");



From fedora-directory-commits at redhat.com  Fri Feb  9 22:34:00 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri,  9 Feb 2007 17:34:00 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.22,
	1.23 configure.ac, 1.15, 1.16 aclocal.m4, 1.15, 1.16 missing,
	1.10, 1.11 install-sh, 1.10, 1.11 depcomp, 1.10, 1.11 compile,
	1.10, 1.11 config.guess, 1.9, 1.10 config.sub, 1.9,
	1.10 Makefile.in, 1.25, 1.26 configure, 1.24, 1.25
Message-ID: <200702092234.l19MY1mc005625@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5558/ldapserver

Modified Files:
	Makefile.am configure.ac aclocal.m4 missing install-sh depcomp 
	compile config.guess config.sub Makefile.in configure 
Log Message:
Resolves: bug 160235
Bug Description: Add support for /etc/init scripts
Reviewed by: nkinder (Thanks!)
Fix Description: Add the new initscript.  The initscript is called $PACKAGE_NAME which by
default is fedora-ds.  This script is created from wrappers/initscript.in,
sed'd by the fixupcmd in Makefile.am during make install.  The way it works is
this: service fedora-ds cmd will execute the cmd on all instances (found in
/etc/fedora-ds by default).  service fedora-ds cmd instance will execute cmd on
only that instance.  So if you have
/etc/fedora-ds/slapd-foo
/etc/fedora-ds/slapd-bar
and you do
service start fedora-ds
it will start up both slapd-foo and slapd-bar.    If you do
service start fedora-ds bar
it will start up only slapd-bar.  If you do
service start fedora-ds biff
you will get an error message.    The initdir is platform specific (e.g.
/etc/rc.d/init.d on linux, /etc/init.d on Solaris) so the
definition was added to the platform dependent section of configure.ac.

The init script is explicitly branded, including the filename.    I needed to add
support to the autotool files so that we could change the name of the file.
Since package_name is defined when you use the AC_INIT macro in configure.ac,
we don't need to define it elsewhere (e.g. #define BRAND_DS).  So I added the
branding and other information to the autotool files, and changed
create_instance to use package_name instead of brand_ds to be consistent.
Having the package_name defined in much fewer places should make it much easier
to change in the future if necessary.

I also fixed a compiler warning in ldaprot.h.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes.  We need to document how to use the initscript, and how to enable startup on boot - chkconfig fedora-ds on



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.am	8 Feb 2007 18:40:12 -0000	1.22
+++ Makefile.am	9 Feb 2007 22:33:58 -0000	1.23
@@ -66,6 +66,7 @@
 serverdir = $(libdir)@serverdir@
 serverplugindir = $(libdir)@serverplugindir@
 taskdir = $(datadir)@scripttemplatedir@
+initdir = $(sysconfdir)@initdir@
 
 #------------------------
 # Build Products
@@ -173,6 +174,8 @@
 	$(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
 	$(srcdir)/ldap/admin/src/scripts/template-migrateTo7
 
+init_SCRIPTS = wrappers/$(PACKAGE_NAME)
+
 #////////////////////////////////////////////////////////////////
 #
 #   Server Strings
@@ -942,8 +945,14 @@
 	-e 's, at serverdir\@,$(serverdir),g' \
 	-e 's, at serverplugindir\@,$(serverplugindir),g' \
 	-e 's, at taskdir\@,$(taskdir),g' \
-	-e 's, at configdir\@,$(configdir),g'
+	-e 's, at configdir\@,$(configdir),g' \
+	-e 's, at sysconfdir\@,$(sysconfdir),g' \
+	-e 's, at localstatedir\@,$(localstatedir),g' \
+	-e 's, at package_name\@,$(PACKAGE_NAME),g'
 
 %: %.in
 	mkdir -p $(dir $@)
 	$(fixupcmd) $^ > $@
+
+%/$(PACKAGE_NAME): %/initscript.in
+	$(fixupcmd) $^ > $@


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- configure.ac	6 Feb 2007 15:51:22 -0000	1.15
+++ configure.ac	9 Feb 2007 22:33:58 -0000	1.16
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT([fedora-ds], [1.1], [http://bugzilla.redhat.com/])
+AC_INIT([fedora-ds], [1.1.0], [http://bugzilla.redhat.com/])
 # AC_CONFIG_HEADER must be called right after AC_INIT.
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
@@ -59,7 +59,7 @@
 ])
 AC_SUBST([debug_defs])
 
-AC_PREFIX_DEFAULT([/opt/fedora-ds])
+AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
 
 # installation paths - by default, configure will just
 # use /usr as the prefix for everything, which means
@@ -75,19 +75,19 @@
 fi
 
 # relative to sysconfdir
-configdir=/fedora-ds/config
+configdir=/$PACKAGE_NAME/config
 # relative to datadir
-sampledatadir=/fedora-ds/data
+sampledatadir=/$PACKAGE_NAME/data
 # relative to sysconfdir
-propertydir=/fedora-ds/property
+propertydir=/$PACKAGE_NAME/property
 # relative to sysconfdir
-schemadir=/fedora-ds/schema
+schemadir=/$PACKAGE_NAME/schema
 # relative to libdir
-serverdir=/fedora-ds
+serverdir=/$PACKAGE_NAME
 # relative to libdir
-serverplugindir=/fedora-ds/plugins
+serverplugindir=/$PACKAGE_NAME/plugins
 # relative to datadir
-scripttemplatedir=/fedora-ds/script-templates
+scripttemplatedir=/$PACKAGE_NAME/script-templates
 AC_SUBST(configdir)
 AC_SUBST(sampledatadir)
 AC_SUBST(propertydir)
@@ -101,6 +101,8 @@
 AM_CONDITIONAL([WINNT], false)
 
 # Deal with platform dependent defines
+# relative to sysconfdir
+initdir=/rc.d
 case $host in
   *-*-linux*)
     AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -110,6 +112,8 @@
     AC_DEFINE([LINUX2_2], [1], [Linux 2.2])
     AC_DEFINE([LINUX2_4], [1], [Linux 2.4])
     platform="linux"
+    # relative to sysconfdir
+    initdir=/rc.d/init.d
     ;;
   ia64-hp-hpux*)
     AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -150,11 +154,14 @@
     LIBDL=-ldl
     AC_SUBST([LIBDL], [$LIBDL])
     platform="solaris"
+    # relative to sysconfdir
+    initdir=/init.d
     ;;
   *)
     platform=""
     ;;
 esac
+AC_SUBST(initdir)
 
 AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
 
















Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.in	8 Feb 2007 18:40:12 -0000	1.25
+++ Makefile.in	9 Feb 2007 22:33:58 -0000	1.26
@@ -94,9 +94,9 @@
 am__installdirs = "$(DESTDIR)$(serverdir)" \
 	"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \
-	"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" \
-	"$(DESTDIR)$(schemadir)"
+	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(taskdir)" \
+	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
+	"$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"
 serverLTLIBRARIES_INSTALL = $(INSTALL)
 serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
@@ -677,8 +677,9 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 taskSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS) $(task_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(init_SCRIPTS) $(task_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -879,6 +880,7 @@
 icu_lib = @icu_lib@
 includedir = @includedir@
 infodir = @infodir@
+initdir = $(sysconfdir)@initdir@
 install_sh = @install_sh@
 ldapsdk_bindir = @ldapsdk_bindir@
 ldapsdk_inc = @ldapsdk_inc@
@@ -1059,6 +1061,7 @@
 	$(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
 	$(srcdir)/ldap/admin/src/scripts/template-migrateTo7
 
+init_SCRIPTS = wrappers/$(PACKAGE_NAME)
 
 #////////////////////////////////////////////////////////////////
 #
@@ -1805,7 +1808,10 @@
 	-e 's, at serverdir\@,$(serverdir),g' \
 	-e 's, at serverplugindir\@,$(serverplugindir),g' \
 	-e 's, at taskdir\@,$(taskdir),g' \
-	-e 's, at configdir\@,$(configdir),g'
+	-e 's, at configdir\@,$(configdir),g' \
+	-e 's, at sysconfdir\@,$(sysconfdir),g' \
+	-e 's, at localstatedir\@,$(localstatedir),g' \
+	-e 's, at package_name\@,$(PACKAGE_NAME),g'
 
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -3612,6 +3618,25 @@
 	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
+install-initSCRIPTS: $(init_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(initdir)" || $(mkdir_p) "$(DESTDIR)$(initdir)"
+	@list='$(init_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(initSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(initdir)/$$f'"; \
+	    $(initSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(initdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-initSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(init_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(initdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(initdir)/$$f"; \
+	done
 install-taskSCRIPTS: $(task_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(taskdir)" || $(mkdir_p) "$(DESTDIR)$(taskdir)"
@@ -8826,7 +8851,7 @@
 all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
 		$(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
+	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -8952,10 +8977,10 @@
 
 info-am:
 
-install-data-am: install-configDATA install-nodist_propertyDATA \
-	install-sampledataDATA install-schemaDATA \
-	install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
-	install-taskSCRIPTS
+install-data-am: install-configDATA install-initSCRIPTS \
+	install-nodist_propertyDATA install-sampledataDATA \
+	install-schemaDATA install-serverLTLIBRARIES \
+	install-serverpluginLTLIBRARIES install-taskSCRIPTS
 
 install-exec-am: install-binPROGRAMS install-binSCRIPTS \
 	install-sbinPROGRAMS
@@ -8987,7 +9012,7 @@
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-configDATA uninstall-info-am \
+	uninstall-configDATA uninstall-info-am uninstall-initSCRIPTS \
 	uninstall-nodist_propertyDATA uninstall-sampledataDATA \
 	uninstall-sbinPROGRAMS uninstall-schemaDATA \
 	uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
@@ -9004,7 +9029,7 @@
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-binSCRIPTS install-configDATA \
 	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man \
+	install-info install-info-am install-initSCRIPTS install-man \
 	install-nodist_propertyDATA install-sampledataDATA \
 	install-sbinPROGRAMS install-schemaDATA \
 	install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
@@ -9013,7 +9038,7 @@
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-configDATA uninstall-info-am \
+	uninstall-configDATA uninstall-info-am uninstall-initSCRIPTS \
 	uninstall-nodist_propertyDATA uninstall-sampledataDATA \
 	uninstall-sbinPROGRAMS uninstall-schemaDATA \
 	uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
@@ -9035,6 +9060,9 @@
 %: %.in
 	mkdir -p $(dir $@)
 	$(fixupcmd) $^ > $@
+
+%/$(PACKAGE_NAME): %/initscript.in
+	$(fixupcmd) $^ > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- configure	8 Feb 2007 18:40:12 -0000	1.24
+++ configure	9 Feb 2007 22:33:58 -0000	1.25
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.
+# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0.
 #
 # Report bugs to <http://bugzilla.redhat.com/>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='fedora-ds'
 PACKAGE_TARNAME='fedora-ds'
-PACKAGE_VERSION='1.1'
-PACKAGE_STRING='fedora-ds 1.1'
+PACKAGE_VERSION='1.1.0'
+PACKAGE_STRING='fedora-ds 1.1.0'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
 
 # Factoring default headers for most tests.
@@ -464,8 +464,8 @@
 # include <unistd.h>
 #endif"
 
-ac_default_prefix=/opt/fedora-ds
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_default_prefix=/opt/$PACKAGE_NAME
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL initdir SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -954,7 +954,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures fedora-ds 1.1 to adapt to many kinds of systems.
+\`configure' configures fedora-ds 1.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fedora-ds 1.1:";;
+     short | recursive ) echo "Configuration of fedora-ds 1.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1186,7 +1186,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-fedora-ds configure 1.1
+fedora-ds configure 1.1.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1200,7 +1200,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fedora-ds $as_me 1.1, which was
+It was created by fedora-ds $as_me 1.1.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1846,7 +1846,7 @@
 
 # Define the identity of the package.
  PACKAGE='fedora-ds'
- VERSION='1.1'
+ VERSION='1.1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22887,19 +22887,19 @@
 fi
 
 # relative to sysconfdir
-configdir=/fedora-ds/config
+configdir=/$PACKAGE_NAME/config
 # relative to datadir
-sampledatadir=/fedora-ds/data
+sampledatadir=/$PACKAGE_NAME/data
 # relative to sysconfdir
-propertydir=/fedora-ds/property
+propertydir=/$PACKAGE_NAME/property
 # relative to sysconfdir
-schemadir=/fedora-ds/schema
+schemadir=/$PACKAGE_NAME/schema
 # relative to libdir
-serverdir=/fedora-ds
+serverdir=/$PACKAGE_NAME
 # relative to libdir
-serverplugindir=/fedora-ds/plugins
+serverplugindir=/$PACKAGE_NAME/plugins
 # relative to datadir
-scripttemplatedir=/fedora-ds/script-templates
+scripttemplatedir=/$PACKAGE_NAME/script-templates
 
 
 
@@ -22922,6 +22922,8 @@
 
 
 # Deal with platform dependent defines
+# relative to sysconfdir
+initdir=/rc.d
 case $host in
   *-*-linux*)
 
@@ -22955,6 +22957,8 @@
 _ACEOF
 
     platform="linux"
+    # relative to sysconfdir
+    initdir=/rc.d/init.d
     ;;
   ia64-hp-hpux*)
 
@@ -23098,6 +23102,8 @@
     LIBDL=$LIBDL
 
     platform="solaris"
+    # relative to sysconfdir
+    initdir=/init.d
     ;;
   *)
     platform=""
@@ -23106,6 +23112,7 @@
 
 
 
+
 if test "$platform" = "solaris"; then
   SOLARIS_TRUE=
   SOLARIS_FALSE='#'
@@ -25259,7 +25266,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by fedora-ds $as_me 1.1, which was
+This file was extended by fedora-ds $as_me 1.1.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25322,7 +25329,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-fedora-ds config.status 1.1
+fedora-ds config.status 1.1.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -25603,6 +25610,7 @@
 s, at LIBSOCKET@,$LIBSOCKET,;t t
 s, at LIBNSL@,$LIBNSL,;t t
 s, at LIBDL@,$LIBDL,;t t
+s, at initdir@,$initdir,;t t
 s, at SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
 s, at SOLARIS_FALSE@,$SOLARIS_FALSE,;t t
 s, at PKG_CONFIG@,$PKG_CONFIG,;t t



From fedora-directory-commits at redhat.com  Fri Feb  9 22:34:01 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri,  9 Feb 2007 17:34:01 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
	create_instance.c, 1.43, 1.44 create_instance.h, 1.14,
	1.15 ds_newinst.pl.in, 1.2, 1.3
Message-ID: <200702092234.l19MY1DV005640@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5558/ldapserver/ldap/admin/src

Modified Files:
	create_instance.c create_instance.h ds_newinst.pl.in 
Log Message:
Resolves: bug 160235
Bug Description: Add support for /etc/init scripts
Reviewed by: nkinder (Thanks!)
Fix Description: Add the new initscript.  The initscript is called $PACKAGE_NAME which by
default is fedora-ds.  This script is created from wrappers/initscript.in,
sed'd by the fixupcmd in Makefile.am during make install.  The way it works is
this: service fedora-ds cmd will execute the cmd on all instances (found in
/etc/fedora-ds by default).  service fedora-ds cmd instance will execute cmd on
only that instance.  So if you have
/etc/fedora-ds/slapd-foo
/etc/fedora-ds/slapd-bar
and you do
service start fedora-ds
it will start up both slapd-foo and slapd-bar.    If you do
service start fedora-ds bar
it will start up only slapd-bar.  If you do
service start fedora-ds biff
you will get an error message.    The initdir is platform specific (e.g.
/etc/rc.d/init.d on linux, /etc/init.d on Solaris) so the
definition was added to the platform dependent section of configure.ac.

The init script is explicitly branded, including the filename.    I needed to add
support to the autotool files so that we could change the name of the file.
Since package_name is defined when you use the AC_INIT macro in configure.ac,
we don't need to define it elsewhere (e.g. #define BRAND_DS).  So I added the
branding and other information to the autotool files, and changed
create_instance to use package_name instead of brand_ds to be consistent.
Having the package_name defined in much fewer places should make it much easier
to change in the future if necessary.

I also fixed a compiler warning in ldaprot.h.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes.  We need to document how to use the initscript, and how to enable startup on boot - chkconfig fedora-ds on



Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- create_instance.c	8 Feb 2007 18:40:12 -0000	1.43
+++ create_instance.c	9 Feb 2007 22:33:58 -0000	1.44
@@ -709,7 +709,7 @@
     }
 
     PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s",
-            cf->datadir, FILE_PATHSEP, cf->brand_ds,
+            cf->datadir, FILE_PATHSEP, cf->package_name,
             FILE_PATHSEP, FILE_PATHSEP, name);
     PR_snprintf(fn, sizeof(fn), "%s%c%s", cs_path, FILE_PATHSEP, name);
     create_instance_mkdir(cs_path, NEWDIR_MODE);
@@ -724,7 +724,7 @@
     table[0][0] = "DS-ROOT";
     table[0][1] = cf->prefix;
     table[1][0] = "DS-BRAND";
-    table[1][1] = cf->brand_ds;
+    table[1][1] = cf->package_name;
     table[2][0] = "SEP";
     table[2][1] = FILE_PATHSEPP;
     table[3][0] = "SERVER-NAME";
@@ -3419,13 +3419,13 @@
 
     /* install certmap.conf at <configdir> */
     PR_snprintf(src, sizeof(src), "%s%c%s%c/config/certmap.conf",
-                cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP);
+                cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
     PR_snprintf(dest, sizeof(dest), "%s/certmap.conf", cf->config_dir);
     create_instance_copy(src, dest, 0600, 0 );
 
     /* generate <confdir>/slapd-collations.conf */
     PR_snprintf(src, sizeof(src), "%s%c%s%c/config/%s-collations.conf",
-                cf->sysconfdir, FILE_PATHSEP, cf->brand_ds,
+                cf->sysconfdir, FILE_PATHSEP, cf->package_name,
                 FILE_PATHSEP, PRODUCT_NAME);
     PR_snprintf(dest, sizeof(dest), "%s%c%s-collations.conf",
             cf->config_dir, FILE_PATHSEP, PRODUCT_NAME);
@@ -3448,16 +3448,16 @@
     fclose(f);
 
     /*
-     * <sysconfdir>/BRAND_DS/schema to schema_dir
+     * <sysconfdir>/PACKAGE_NAME/schema to schema_dir
      */
     PR_snprintf(src, sizeof(src), "%s%c%s%cschema", 
-        cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP);
+        cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
     if (NULL != (t = ds_copy_group_files_using_mode_owner(src, cf->schema_dir, 0, NEWFILE_MODE, pw)))
         return t;
         
 #if defined (BUILD_PRESENCE)
     PR_snprintf(src, sizeof(src), "%s%c%s%c/config/presence",
-                cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP);
+                cf->sysconfdir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
     PR_snprintf(dest, sizeof(dest), "%s/presence", cf->config_dir);
     if (t = ds_copy_group_files(src, dest, 0))
         return t;
@@ -4234,7 +4234,7 @@
 /*
  * FHS description
  * cf->prefix: %{_prefix} 
- * cf->sroot: %{_libdir}/BRAND_DS 
+ * cf->sroot: %{_libdir}/PACKAGE_NAME 
  * cf->localstatedir: %{_localstatedir}
  * cf->sysconfdir: %{_sysconfdir}
  * cf->bindir: %{_bindir}
@@ -4242,16 +4242,16 @@
  * cf->datadir: %{_datadir}
  * cf->docdir: %{_docdir}
  * cf->inst_dir: <sroot>/slapd-<servid>
- * cf->config_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>
- * cf->schema_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>/schema
- * cf->lock_dir: <localstatedir>/lock/BRAND_DS/slapd-<servid>
- * cf->log_dir: <localstatedir>/log/BRAND_DS/slapd-<servid>
- * cf->run_dir: <localstatedir>/run/BRAND_DS (slapd-instance.pid slapd-instance.startpid files)
- * cf->db_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>/db
- * cf->bak_dir: <localstatedir>/lib/BRAND_DS/slapd-<servid>/bak
- * cf->tmp_dir: <localstatedir>/tmp/BRAND_DS/slapd-<servid>
+ * cf->config_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid>
+ * cf->schema_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid>/schema
+ * cf->lock_dir: <localstatedir>/lock/PACKAGE_NAME/slapd-<servid>
+ * cf->log_dir: <localstatedir>/log/PACKAGE_NAME/slapd-<servid>
+ * cf->run_dir: <localstatedir>/run/PACKAGE_NAME (slapd-instance.pid slapd-instance.startpid files)
+ * cf->db_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid>/db
+ * cf->bak_dir: <localstatedir>/lib/PACKAGE_NAME/slapd-<servid>/bak
+ * cf->tmp_dir: <localstatedir>/tmp/PACKAGE_NAME/slapd-<servid>
  * cf->ldif_dir: <datadir>/<brand-ds>/ldif
- * cf->cert_dir: <sysconfdir>/BRAND_DS/slapd-<servid>
+ * cf->cert_dir: <sysconfdir>/PACKAGE_NAME/slapd-<servid>
  * cf->sasl_path: <sroot>/sasl2
  * cf->plugin_dir: <sroot>/plugins
  *
@@ -4274,7 +4274,7 @@
     int prefixlen = 0;
     LDAPURLDesc *desc = 0;
 
-    cf->brand_ds = BRAND_DS;
+    cf->package_name = PACKAGE_NAME;
     if (rm && qs && !strcmp(rm, "GET"))
     {
         ds_get_begin(qs);
@@ -4301,7 +4301,7 @@
     }
 
     cf->sroot = PR_smprintf("%s%s%c%s",
-                prefix, LIBDIR, FILE_PATHSEP, cf->brand_ds);
+                prefix, LIBDIR, FILE_PATHSEP, cf->package_name);
     temp = ds_a_get_cgi_var("sasl_path", NULL, NULL);
     if (NULL != temp) {
         /* if sasl_path is given, we set it in the conf file regardless of
@@ -4487,7 +4487,7 @@
     if (NULL == temp) {
         cf->config_dir = PR_smprintf("%s%c%s%c%s-%s",
                             cf->sysconfdir, FILE_PATHSEP,
-                            cf->brand_ds, FILE_PATHSEP,
+                            cf->package_name, FILE_PATHSEP,
                             PRODUCT_NAME, cf->servid);
     } else {
         cf->config_dir = PL_strdup(temp);
@@ -4500,7 +4500,7 @@
     if (NULL == temp) {
         cf->schema_dir = PR_smprintf("%s%c%s%c%s-%s%cschema",
                             cf->sysconfdir, FILE_PATHSEP,
-                            cf->brand_ds, FILE_PATHSEP,
+                            cf->package_name, FILE_PATHSEP,
                             PRODUCT_NAME, cf->servid, FILE_PATHSEP);
     } else {
         cf->schema_dir = PL_strdup(temp);
@@ -4510,7 +4510,7 @@
     if (NULL == temp) {
         cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s",
                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
-                            cf->brand_ds, FILE_PATHSEP,
+                            cf->package_name, FILE_PATHSEP,
                             PRODUCT_NAME, cf->servid);
     } else {
         cf->lock_dir = PL_strdup(temp);
@@ -4520,7 +4520,7 @@
     if (NULL == temp) {
         cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s",
                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
-                            cf->brand_ds, FILE_PATHSEP,
+                            cf->package_name, FILE_PATHSEP,
                             PRODUCT_NAME, cf->servid);
     } else {
         cf->log_dir = PL_strdup(temp);
@@ -4530,7 +4530,7 @@
     if (NULL == temp) {
         cf->run_dir = PR_smprintf("%s%crun%c%s",
                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
-                            cf->brand_ds);
+                            cf->package_name);
     } else {
         cf->run_dir = PL_strdup(temp);
     }
@@ -4541,7 +4541,7 @@
     if (NULL == temp) {
         cf->db_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cdb",
                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
-                            cf->brand_ds, FILE_PATHSEP,
+                            cf->package_name, FILE_PATHSEP,
                             PRODUCT_NAME, cf->servid, FILE_PATHSEP);
     } else {
         cf->db_dir = PL_strdup(temp);
@@ -4551,7 +4551,7 @@
     if (NULL == temp) {
         cf->bak_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cbak",
                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
-                            cf->brand_ds, FILE_PATHSEP,
+                            cf->package_name, FILE_PATHSEP,
                             PRODUCT_NAME, cf->servid, FILE_PATHSEP);
     } else {
         cf->bak_dir = PL_strdup(temp);
@@ -4562,7 +4562,7 @@
     temp = ds_a_get_cgi_var("ldif_dir", NULL, NULL);
     if (NULL == temp) {
         cf->ldif_dir = PR_smprintf("%s%c%s%cldif",
-                            cf->datadir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP);
+                            cf->datadir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP);
     } else {
         cf->ldif_dir = PL_strdup(temp);
     }
@@ -4571,7 +4571,7 @@
     if (NULL == temp) {
         cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s",
                             cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP,
-                            cf->brand_ds, FILE_PATHSEP,
+                            cf->package_name, FILE_PATHSEP,
                             PRODUCT_NAME, cf->servid);
     } else {
         cf->tmp_dir = PL_strdup(temp);


Index: create_instance.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- create_instance.h	7 Feb 2007 23:57:40 -0000	1.14
+++ create_instance.h	9 Feb 2007 22:33:59 -0000	1.15
@@ -54,8 +54,8 @@
 extern "C" {            /* Assume C declarations for C++ */
 #endif  /* __cplusplus */
 
-#ifndef BRAND_DS
-#define BRAND_DS        "fedora-ds"
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME    "fedora-ds"
 #endif
 
 #ifdef XP_UNIX
@@ -121,7 +121,7 @@
     char *datadir;
     char *docdir;
 
-    char *brand_ds;
+    char *package_name;
     char *lang;
 
     char *servname;


Index: ds_newinst.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds_newinst.pl.in	7 Feb 2007 23:57:40 -0000	1.2
+++ ds_newinst.pl.in	9 Feb 2007 22:33:59 -0000	1.3
@@ -165,7 +165,7 @@
 # next, construct a hash table with our arguments
 
 my %cgiargs = ();
-my $brand_ds = "fedora-ds";
+my $package_name = "@package_name@";
 
 # the following items are always required
 addAndCheck(\%cgiargs, "sroot", \%table, "General", "ServerRoot");
@@ -238,8 +238,8 @@
 }
 $cgiargs{prefix} = $prefix;
 
-if ($table{General}->{BrandDs}) {
-	$brand_ds = $table{General}->{BrandDs};
+if ($table{General}->{PackageName}) {
+	$package_name = $table{General}->{PackageName};
 }
 
 # populate the DS with this file - the suffix in this file must
@@ -256,7 +256,7 @@
 
 my $prog = "@bindir@/ds_newinst";
 if (! -x $prog) {
-    $prog = "@libdir@/$brand_ds/ds_newinst";
+    $prog = "@libdir@/$package_name/ds_newinst";
 }
 
 my $rc = &cgiFake($sroot, $verbose,



From fedora-directory-commits at redhat.com  Fri Feb  9 22:34:01 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri,  9 Feb 2007 17:34:01 -0500
Subject: [Fedora-directory-commits] ldapserver/wrappers initscript.in, NONE,
	1.1
Message-ID: <200702092234.l19MY1SA005652@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5558/ldapserver/wrappers

Added Files:
	initscript.in 
Log Message:
Resolves: bug 160235
Bug Description: Add support for /etc/init scripts
Reviewed by: nkinder (Thanks!)
Fix Description: Add the new initscript.  The initscript is called $PACKAGE_NAME which by
default is fedora-ds.  This script is created from wrappers/initscript.in,
sed'd by the fixupcmd in Makefile.am during make install.  The way it works is
this: service fedora-ds cmd will execute the cmd on all instances (found in
/etc/fedora-ds by default).  service fedora-ds cmd instance will execute cmd on
only that instance.  So if you have
/etc/fedora-ds/slapd-foo
/etc/fedora-ds/slapd-bar
and you do
service start fedora-ds
it will start up both slapd-foo and slapd-bar.    If you do
service start fedora-ds bar
it will start up only slapd-bar.  If you do
service start fedora-ds biff
you will get an error message.    The initdir is platform specific (e.g.
/etc/rc.d/init.d on linux, /etc/init.d on Solaris) so the
definition was added to the platform dependent section of configure.ac.

The init script is explicitly branded, including the filename.    I needed to add
support to the autotool files so that we could change the name of the file.
Since package_name is defined when you use the AC_INIT macro in configure.ac,
we don't need to define it elsewhere (e.g. #define BRAND_DS).  So I added the
branding and other information to the autotool files, and changed
create_instance to use package_name instead of brand_ds to be consistent.
Having the package_name defined in much fewer places should make it much easier
to change in the future if necessary.

I also fixed a compiler warning in ldaprot.h.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes.  We need to document how to use the initscript, and how to enable startup on boot - chkconfig fedora-ds on



--- NEW FILE initscript.in ---
#!/bin/bash
#
# @package_name@    This starts and stops @package_name@
#
# chkconfig:   - 21 79
# description: @package_name@ Directory Server
# processname: @sbindir@/ns-slapd
# configdir:   @sysconfdir@/@package_name@/
# piddir:      @localstatedir@/run/@package_name@
# datadir:     @localstatedir@/lib/@package_name@/slapd-<instance name>
#

# Source function library.
. /etc/rc.d/init.d/functions
# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
if [ ${NETWORKING} = "no" ]
then
    echo "Networking is down"
    exit 0
fi


exec="@sbindir@/ns-slapd"
prog="@package_name@"
# Lockfile
lockfile="@localstatedir@/lock/subsys/@package_name@"
# PID directory
piddir="@localstatedir@/run/@package_name@"
# Instance basedir
instbase="@sysconfdir@/@package_name@"


[ -f $exec ] || exit 0


umask 077

pids=$(pidof $exec)

INSTANCES=""

for FILE in `/bin/ls -d $instbase/slapd-* 2>/dev/null`; do
    INSTANCES+=$(echo "$FILE" | sed -e "s|$instbase/slapd-||")
    INSTANCES+=" "
done

if [ -n "$2" ]; then
   for I in $INSTANCES; do
      if [ "$2" == "$I" ]; then
         INSTANCES="$2"
      fi
   done
   if [ "$2" != "$INSTANCES" ]; then
      echo -n "$2 is an invalid @package_name@ instance"
      failure; echo
      exit 1
   fi
fi

start() {
    if [ -n "$INSTANCES" ]; then
        export LD_LIBRARY_PATH=@libdir@/@package_name@:@nss_libdir@
        echo  "Starting $prog: "
        # Start every slapd instance that isn't already running
        errors=0
        successes=0
        for instance in $INSTANCES; do
            echo -n "    $instance..."
            # the server creates pidfile and writes the pid to it when it is fully
            # started and available to serve clients
            pidfile=$piddir/slapd-$instance.pid
            # the server creates startpidfile and writes the pid to just after
            # the process begins i.e. it received the startup request and didn't
            # die a horrible death (e.g. shared lib problem, oom, etc.)
            startpidfile=$piddir/slapd-$instance.startpid
            server_running=0
            if [ -e $pidfile ]; then
                pid=$(cat $pidfile)
                if [ $(echo "$pids" | grep -c $pid) -ge 1 ]; then
                    echo -n " already running"
                    success; echo
                    let successes=successes+1
                    server_running=1
                else
                    echo -n " not running, but pid file exists - attempt to start anyway..."
                    rm -f $pidfile
                fi
            fi
            server_started=0
            if [ $server_running -eq 0 ] ; then
                rm -f $pidfile
                rm -f $startpidfile
                $exec -D $instbase/slapd-$instance -i $pidfile -w $startpidfile
                if [ $? -eq 0 ]; then
                    server_started=1 # well, perhaps not running, but started ok
                else
                    failure; echo
                    let errors=errors+1
                fi
            fi
            # ok, if we started the server successfully, let's see if it is really
            # running and ready to serve requests
            if [ $server_started -eq 1 ] ; then
                loop_counter=1
				# wait for 10 seconds for the start pid file to appear
                max_count=10
                while test $loop_counter -le $max_count; do
                    loop_counter=`expr $loop_counter + 1`
                    if test ! -f $startpidfile ; then
                        sleep 1
                    else
                        pid=`cat $startpidfile`
                    fi
                done
                if test ! -f $startpidfile ; then
                    failure; echo
                    let errors=errors+1
                    server_started=0
                fi
            fi
            # ok, server wrote the startpid file - let's see if it comes up
            # ready to service requests
            if [ $server_started -eq 1 ] ; then
                loop_counter=1
				# wait for 10 minutes (600 times 1 seconds)
                max_count=600
                while test $loop_counter -le $max_count ; do
                    loop_counter=`expr $loop_counter + 1`
                    if test ! -f $pidfile ; then
                        if kill -0 $pid > /dev/null 2>&1 ; then
                            sleep 1
                        else
                            break
                        fi
                    else
                        pid=`cat $pidfile`
                        break
                    fi
                done
                if kill -0 $pid > /dev/null 2>&1 && test -f $pidfile ; then
                    success; echo
                    let successes=successes+1
                else
                    failure; echo
                    let errors=errors+1
                fi
            fi
            rm -f $startpidfile
        done
        if [ $successes -ge 1 ]; then
            touch $lockfile
        fi
        if [ $errors -ge 1 ]; then
            echo "*** Warning: $errors instance(s) failed to start"
        fi
    else
        echo "*** Error: no $prog instances configured"
    fi
}

stop() {
    echo "Shutting down $prog: "
    errors=0
    for instance in $INSTANCES; do
        pidfile=$piddir/slapd-$instance.pid
        if [ -e $pidfile ]; then
            pid=$(cat $pidfile)
            echo -n "    $instance..."
            server_stopped=0
            if [ $(echo "$pids" | grep -c $pid) -ge 1 ]; then
                kill $pid
                if [ $? -eq 0 ]; then
                    server_stopped=1
                else
                    failure; echo
                    let errors=errors+1
                fi
            fi
            if [ $server_stopped -eq 1 ] ; then
                loop_counter=1
				# wait for 10 minutes (600 times 1 second)
                max_count=600
                while test $loop_counter -le $max_count; do
                    loop_counter=`expr $loop_counter + 1`
                    if kill -0 $pid > /dev/null 2>&1 ; then
                        sleep 1
                    else
                        if test -f $pidfile ; then
                            rm -f $pidfile
                        fi
                        break
                    fi
                done
                if test -f $pidfile ; then
                    failure; echo
                    let errors=errors+1
                else
                    success; echo
                    rm -f $pidfile
                fi
            fi
        fi
    done
    if [ $errors -ge 1 ]; then
        echo -n "*** Error: $errors instance(s) unsuccessfully stopped"
        failure; echo
    else
        rm -f $lockfile
    fi
}

restart() {
    stop
    start
}


status() {
     for instance in $INSTANCES; do
         if [ -e $piddir/slapd-$instance.pid ]; then
             pid=$(cat $piddir/slapd-$instance.pid)
             if [ $(echo "$pids" | grep -c $pid) -ge 1 ]; then
                 echo "$prog $instance (pid $pid) is running..."
             else
                echo "$prog $instance dead but pid file exists"
             fi
         else
             echo "$prog $instance is stopped"
         fi
     done
}


case "$1" in
    start|stop|restart|reload|status)
        $1
        ;;
    condrestart)
        [ ! -f $lockfile ] || restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|condrestart} [instance-name]"
        exit 2
esac



From fedora-directory-commits at redhat.com  Fri Feb  9 22:34:01 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri,  9 Feb 2007 17:34:01 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/include ldaprot.h, 1.5,
	1.6
Message-ID: <200702092234.l19MY1It005647@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5558/ldapserver/ldap/include

Modified Files:
	ldaprot.h 
Log Message:
Resolves: bug 160235
Bug Description: Add support for /etc/init scripts
Reviewed by: nkinder (Thanks!)
Fix Description: Add the new initscript.  The initscript is called $PACKAGE_NAME which by
default is fedora-ds.  This script is created from wrappers/initscript.in,
sed'd by the fixupcmd in Makefile.am during make install.  The way it works is
this: service fedora-ds cmd will execute the cmd on all instances (found in
/etc/fedora-ds by default).  service fedora-ds cmd instance will execute cmd on
only that instance.  So if you have
/etc/fedora-ds/slapd-foo
/etc/fedora-ds/slapd-bar
and you do
service start fedora-ds
it will start up both slapd-foo and slapd-bar.    If you do
service start fedora-ds bar
it will start up only slapd-bar.  If you do
service start fedora-ds biff
you will get an error message.    The initdir is platform specific (e.g.
/etc/rc.d/init.d on linux, /etc/init.d on Solaris) so the
definition was added to the platform dependent section of configure.ac.

The init script is explicitly branded, including the filename.    I needed to add
support to the autotool files so that we could change the name of the file.
Since package_name is defined when you use the AC_INIT macro in configure.ac,
we don't need to define it elsewhere (e.g. #define BRAND_DS).  So I added the
branding and other information to the autotool files, and changed
create_instance to use package_name instead of brand_ds to be consistent.
Having the package_name defined in much fewer places should make it much easier
to change in the future if necessary.

I also fixed a compiler warning in ldaprot.h.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes.  We need to document how to use the initscript, and how to enable startup on boot - chkconfig fedora-ds on



Index: ldaprot.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/include/ldaprot.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ldaprot.h	10 Nov 2006 23:44:41 -0000	1.5
+++ ldaprot.h	9 Feb 2007 22:33:59 -0000	1.6
@@ -47,10 +47,18 @@
 extern "C" {
 #endif
 
+#ifndef LDAP_VERSION1
 #define LDAP_VERSION1	1
+#endif
+#ifndef LDAP_VERSION2
 #define LDAP_VERSION2	2
+#endif
+#ifndef LDAP_VERSION3
 #define LDAP_VERSION3	3
+#endif
+#ifndef LDAP_VERSION
 #define LDAP_VERSION	LDAP_VERSION2
+#endif
 
 #define COMPAT20
 #define COMPAT30



From fedora-directory-commits at redhat.com  Fri Feb  9 23:28:22 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri,  9 Feb 2007 18:28:22 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.23,
	1.24 Makefile.in, 1.26, 1.27 aclocal.m4, 1.16, 1.17 compile,
	1.11, 1.12 config.guess, 1.10, 1.11 config.sub, 1.10,
	1.11 configure, 1.25, 1.26 configure.ac, 1.16, 1.17 depcomp,
	1.11, 1.12 install-sh, 1.11, 1.12 ltmain.sh, 1.7, 1.8 missing,
	1.11, 1.12
Message-ID: <200702092328.l19NSMFG010660@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10436

Modified Files:
	Makefile.am Makefile.in aclocal.m4 compile config.guess 
	config.sub configure configure.ac depcomp install-sh ltmain.sh 
	missing 
Log Message:
Resolves: 228082
Summary: Added --enable-bundle option for legacy builds.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.am	9 Feb 2007 22:33:58 -0000	1.23
+++ Makefile.am	9 Feb 2007 23:28:19 -0000	1.24
@@ -927,6 +927,30 @@
 # LD_LIBRARY_PATH = ${prefix}/lib/fedora-ds
 # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
 # LD_LIBRARY_PATH = /usr/lib/fedora-ds
+if BUNDLE
+fixupcmd = sed \
+	-e 's, at bindir\@,$(bindir),g' \
+	-e 's, at sbindir\@,$(sbindir),g' \
+	-e 's, at libdir\@,$(libdir),g' \
+	-e 's, at nspr_libdir\@,$(libdir),g' \
+	-e 's, at nss_libdir\@,$(libdir),g' \
+	-e 's, at ldapsdk_libdir\@,$(libdir),g' \
+	-e 's, at ldapsdk_bindir\@,$(bindir),g' \
+	-e 's, at db_libdir\@,$(libdir),g' \
+	-e 's, at db_bindir\@,$(bindir),g' \
+	-e 's, at sasl_libdir\@,$(libdir),g' \
+	-e 's, at netsnmp_libdir\@,$(libdir),g' \
+	-e 's, at propertydir\@,$(propertydir),g' \
+	-e 's, at datadir\@,$(datadir),g' \
+	-e 's, at schemadir\@,$(schemadir),g' \
+	-e 's, at serverdir\@,$(serverdir),g' \
+	-e 's, at serverplugindir\@,$(serverplugindir),g' \
+	-e 's, at taskdir\@,$(taskdir),g' \
+	-e 's, at configdir\@,$(configdir),g' \
+	-e 's, at sysconfdir\@,$(sysconfdir),g' \
+	-e 's, at localstatedir\@,$(localstatedir),g' \
+	-e 's, at package_name\@,$(PACKAGE_NAME),g'
+else
 fixupcmd = sed \
 	-e 's, at bindir\@,$(bindir),g' \
 	-e 's, at sbindir\@,$(sbindir),g' \
@@ -949,6 +973,7 @@
 	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 	-e 's, at localstatedir\@,$(localstatedir),g' \
 	-e 's, at package_name\@,$(PACKAGE_NAME),g'
+endif
 
 %: %.in
 	mkdir -p $(dir $@)


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.26 -r 1.27 Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.in	9 Feb 2007 22:33:58 -0000	1.26
+++ Makefile.in	9 Feb 2007 23:28:19 -0000	1.27
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,8 @@
 
 
 
+SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES!
 ) $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -685,19 +687,19 @@
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \
 	$(libacl_plugin_la_SOURCES) \
@@ -777,6 +779,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUNDLE_FALSE = @BUNDLE_FALSE@
+BUNDLE_TRUE = @BUNDLE_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -826,7 +830,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -1783,6 +1786,29 @@
 
 rsearch_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
 rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKET)
+ at BUNDLE_FALSE@fixupcmd = sed \
+ at BUNDLE_FALSE@	-e 's, at bindir\@,$(bindir),g' \
+ at BUNDLE_FALSE@	-e 's, at sbindir\@,$(sbindir),g' \
+ at BUNDLE_FALSE@	-e 's, at libdir\@,$(libdir),g' \
+ at BUNDLE_FALSE@	-e 's, at nspr_libdir\@,$(nspr_libdir),g' \
+ at BUNDLE_FALSE@	-e 's, at nss_libdir\@,$(nss_libdir),g' \
+ at BUNDLE_FALSE@	-e 's, at ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
+ at BUNDLE_FALSE@	-e 's, at ldapsdk_bindir\@,$(ldapsdk_bindir),g' \
+ at BUNDLE_FALSE@	-e 's, at db_libdir\@,$(db_libdir),g' \
+ at BUNDLE_FALSE@	-e 's, at db_bindir\@,$(db_bindir),g' \
+ at BUNDLE_FALSE@	-e 's, at sasl_libdir\@,$(sasl_libdir),g' \
+ at BUNDLE_FALSE@	-e 's, at netsnmp_libdir\@,$(netsnmp_libdir),g' \
+ at BUNDLE_FALSE@	-e 's, at propertydir\@,$(propertydir),g' \
+ at BUNDLE_FALSE@	-e 's, at datadir\@,$(datadir),g' \
+ at BUNDLE_FALSE@	-e 's, at schemadir\@,$(schemadir),g' \
+ at BUNDLE_FALSE@	-e 's, at serverdir\@,$(serverdir),g' \
+ at BUNDLE_FALSE@	-e 's, at serverplugindir\@,$(serverplugindir),g' \
+ at BUNDLE_FALSE@	-e 's, at taskdir\@,$(taskdir),g' \
+ at BUNDLE_FALSE@	-e 's, at configdir\@,$(configdir),g' \
+ at BUNDLE_FALSE@	-e 's, at sysconfdir\@,$(sysconfdir),g' \
+ at BUNDLE_FALSE@	-e 's, at localstatedir\@,$(localstatedir),g' \
+ at BUNDLE_FALSE@	-e 's, at package_name\@,$(PACKAGE_NAME),g'
+
 
 # these are for the config files and scripts that we need to generate and replace
 # the paths and other tokens with the real values set during configure/make
@@ -1790,28 +1816,28 @@
 # LD_LIBRARY_PATH = ${prefix}/lib/fedora-ds
 # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
 # LD_LIBRARY_PATH = /usr/lib/fedora-ds
-fixupcmd = sed \
-	-e 's, at bindir\@,$(bindir),g' \
-	-e 's, at sbindir\@,$(sbindir),g' \
-	-e 's, at libdir\@,$(libdir),g' \
-	-e 's, at nspr_libdir\@,$(nspr_libdir),g' \
-	-e 's, at nss_libdir\@,$(nss_libdir),g' \
-	-e 's, at ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
-	-e 's, at ldapsdk_bindir\@,$(ldapsdk_bindir),g' \
-	-e 's, at db_libdir\@,$(db_libdir),g' \
-	-e 's, at db_bindir\@,$(db_bindir),g' \
-	-e 's, at sasl_libdir\@,$(sasl_libdir),g' \
-	-e 's, at netsnmp_libdir\@,$(netsnmp_libdir),g' \
-	-e 's, at propertydir\@,$(propertydir),g' \
-	-e 's, at datadir\@,$(datadir),g' \
-	-e 's, at schemadir\@,$(schemadir),g' \
-	-e 's, at serverdir\@,$(serverdir),g' \
-	-e 's, at serverplugindir\@,$(serverplugindir),g' \
-	-e 's, at taskdir\@,$(taskdir),g' \
-	-e 's, at configdir\@,$(configdir),g' \
-	-e 's, at sysconfdir\@,$(sysconfdir),g' \
-	-e 's, at localstatedir\@,$(localstatedir),g' \
-	-e 's, at package_name\@,$(PACKAGE_NAME),g'
+ at BUNDLE_TRUE@fixupcmd = sed \
+ at BUNDLE_TRUE@	-e 's, at bindir\@,$(bindir),g' \
+ at BUNDLE_TRUE@	-e 's, at sbindir\@,$(sbindir),g' \
+ at BUNDLE_TRUE@	-e 's, at libdir\@,$(libdir),g' \
+ at BUNDLE_TRUE@	-e 's, at nspr_libdir\@,$(libdir),g' \
+ at BUNDLE_TRUE@	-e 's, at nss_libdir\@,$(libdir),g' \
+ at BUNDLE_TRUE@	-e 's, at ldapsdk_libdir\@,$(libdir),g' \
+ at BUNDLE_TRUE@	-e 's, at ldapsdk_bindir\@,$(bindir),g' \
+ at BUNDLE_TRUE@	-e 's, at db_libdir\@,$(libdir),g' \
+ at BUNDLE_TRUE@	-e 's, at db_bindir\@,$(bindir),g' \
+ at BUNDLE_TRUE@	-e 's, at sasl_libdir\@,$(libdir),g' \
+ at BUNDLE_TRUE@	-e 's, at netsnmp_libdir\@,$(libdir),g' \
+ at BUNDLE_TRUE@	-e 's, at propertydir\@,$(propertydir),g' \
+ at BUNDLE_TRUE@	-e 's, at datadir\@,$(datadir),g' \
+ at BUNDLE_TRUE@	-e 's, at schemadir\@,$(schemadir),g' \
+ at BUNDLE_TRUE@	-e 's, at serverdir\@,$(serverdir),g' \
+ at BUNDLE_TRUE@	-e 's, at serverplugindir\@,$(serverplugindir),g' \
+ at BUNDLE_TRUE@	-e 's, at taskdir\@,$(taskdir),g' \
+ at BUNDLE_TRUE@	-e 's, at configdir\@,$(configdir),g' \
+ at BUNDLE_TRUE@	-e 's, at sysconfdir\@,$(sysconfdir),g' \
+ at BUNDLE_TRUE@	-e 's, at localstatedir\@,$(localstatedir),g' \
+ at BUNDLE_TRUE@	-e 's, at package_name\@,$(PACKAGE_NAME),g'
 
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -5067,2286 +5093,2286 @@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi`
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo: ldap/servers/plugins/acl/acl_ext.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl_ext.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo: ldap/servers/plugins/acl/aclanom.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclanom.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo: ldap/servers/plugins/acl/acleffectiverights.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acleffectiverights.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo: ldap/servers/plugins/acl/aclgroup.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclgroup.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo: ldap/servers/plugins/acl/aclinit.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
[...3054 lines suppressed...]
 lib/libaccess/libns_dshttpd_la-nseframe.lo: lib/libaccess/nseframe.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nseframe.cpp' object='lib/libaccess/libns_dshttpd_la-nseframe.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
 
 lib/libaccess/libns_dshttpd_la-nsautherr.lo: lib/libaccess/nsautherr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nsautherr.cpp' object='lib/libaccess/libns_dshttpd_la-nsautherr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
 
 lib/libaccess/libns_dshttpd_la-oneeval.lo: lib/libaccess/oneeval.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/oneeval.cpp' object='lib/libaccess/libns_dshttpd_la-oneeval.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
 
 lib/libaccess/libns_dshttpd_la-register.lo: lib/libaccess/register.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/register.cpp' object='lib/libaccess/libns_dshttpd_la-register.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
 
 lib/libaccess/libns_dshttpd_la-symbols.lo: lib/libaccess/symbols.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/symbols.cpp' object='lib/libaccess/libns_dshttpd_la-symbols.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
 
 lib/libaccess/libns_dshttpd_la-usi.lo: lib/libaccess/usi.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usi.cpp' object='lib/libaccess/libns_dshttpd_la-usi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
 
 lib/libaccess/libns_dshttpd_la-usrcache.lo: lib/libaccess/usrcache.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usrcache.cpp' object='lib/libaccess/libns_dshttpd_la-usrcache.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
 
 lib/base/libns_dshttpd_la-crit.lo: lib/base/crit.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/crit.cpp' object='lib/base/libns_dshttpd_la-crit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
 
 lib/base/libns_dshttpd_la-dns.lo: lib/base/dns.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dns.cpp' object='lib/base/libns_dshttpd_la-dns.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
 
 lib/base/libns_dshttpd_la-dnsdmain.lo: lib/base/dnsdmain.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dnsdmain.cpp' object='lib/base/libns_dshttpd_la-dnsdmain.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
 
 lib/base/libns_dshttpd_la-ereport.lo: lib/base/ereport.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/ereport.cpp' object='lib/base/libns_dshttpd_la-ereport.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
 
 lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
 
 lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
 
 lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
 
 lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
 
 lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
 
 lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
 
 lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
 
 lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
 
 lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
 
 lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
 
 lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.16 -r 1.17 aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aclocal.m4	9 Feb 2007 22:33:58 -0000	1.16
+++ aclocal.m4	9 Feb 2007 23:28:19 -0000	1.17
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 47 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +123,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
+Xsed='sed -e s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +143,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a `.a' archive for static linking (except M$VC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,7 +163,6 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -183,17 +182,15 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
-_LT_CC_BASENAME([$compiler])
-
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -234,56 +231,11 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
-
-
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -356,15 +308,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -533,7 +485,7 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -584,22 +536,6 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -631,7 +567,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -641,10 +577,8 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     # So say no if there are warnings
[...3358 lines suppressed...]
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -7032,16 +6694,27 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
+
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -7095,15 +6768,26 @@
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                     -*- Autoconf -*-
+# Helper functions for option handling.                    -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 
-# serial 3
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -7128,16 +6812,28 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
 #
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Check to make sure that the build environment is sane.
+#
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# 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, 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.
 
-# serial 4
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
 
 # AM_SANITY_CHECK
 # ---------------
@@ -7180,14 +6876,25 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # AM_PROG_INSTALL_STRIP
-# ---------------------
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -7210,13 +6917,25 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2004  Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
 
-# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------


Index: compile
===================================================================
RCS file: /cvs/dirsec/ldapserver/compile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compile	9 Feb 2007 22:33:58 -0000	1.11
+++ compile	9 Feb 2007 23:28:19 -0000	1.12
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2005-05-14.22
+scriptversion=2004-09-10.20
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,11 +47,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit $?
+    exit 0
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit $?
+    exit 0
     ;;
 esac
 
@@ -125,8 +125,6 @@
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"


Index: config.guess
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.guess,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config.guess	9 Feb 2007 22:33:58 -0000	1.10
+++ config.guess	9 Feb 2007 23:28:19 -0000	1.11
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2004-09-07'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,15 +17,13 @@
 #
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Originally written by Per Bothner <per at bothner.com>.
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -55,7 +53,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -68,11 +66,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -125,7 +123,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi at noc.rutgers.edu 1994-08-24)
@@ -198,20 +196,55 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit ;;
+	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -264,43 +297,37 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit ;;
+	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit ;;
+	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit ;;
+	exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
+	exit 0 ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
+	exit 0 ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit ;;
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	exit 0;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -308,32 +335,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit ;;
+	exit 0 ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -342,10 +369,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
+	exit 0 ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -357,10 +384,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit ;;
+	exit 0 ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -371,40 +398,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit ;;
+	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -428,33 +455,32 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit ;;
+	exit 0 ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit ;;
+	exit 0 ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit ;;
+	exit 0 ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit ;;
+	exit 0 ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -470,29 +496,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+ 	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit ;;
+	exit 0 ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit ;;
+	exit 0 ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit ;;
+	exit 0 ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	exit 0 ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit ;;
+	exit 0 ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -500,7 +526,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -515,18 +541,14 @@
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	exit 0 ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -540,28 +562,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit ;;
+	exit 0 ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit ;;
+	exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit ;;
+	exit 0 ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit ;;
+	exit 0 ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit ;;
+	exit 0 ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit ;;
+	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -623,19 +645,9 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -643,11 +655,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -675,166 +687,158 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
-	exit ;;
+	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit ;;
+	exit 0 ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit ;;
+	exit 0 ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit ;;
+	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit ;;
+	exit 0 ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit ;;
+	exit 0 ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit ;;
+	exit 0 ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit ;;
+	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+        exit 0 ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
+	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
+	exit 0 ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	exit 0 ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
+	exit 0 ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
+	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
+	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit ;;
+	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
+	exit 0 ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
+	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit ;;
+	exit 0 ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit ;;
+	exit 0 ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -852,7 +856,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -871,14 +875,14 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -892,7 +896,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
+	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -900,25 +904,25 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit ;;
+	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
+	exit 0 ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -936,15 +940,15 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
+		exit 0 ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
+		exit 0 ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
+		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -972,18 +976,15 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit ;;
+	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -991,27 +992,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
+	exit 0 ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
+	exit 0 ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
+	exit 0 ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
+	exit 0 ;;
+	i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
+	exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1019,16 +1020,15 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	exit 0 ;;
+    i*86:*:5:[78]*)
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
+	exit 0 ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1046,73 +1046,73 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit ;;
+	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit ;;
+        exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit ;;
+	exit 0 ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit ;;
+	exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit ;;
+	exit 0 ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit ;;
+	exit 0 ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit ;;
+	exit 0 ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit ;;
+	exit 0 ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit ;;
+	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1120,65 +1120,61 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit ;;
+	exit 0 ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel at ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit ;;
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit ;;
+	exit 0 ;;
     *:*:*:FTX*)
 	# From seanf at swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green at stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	exit 0 ;;
     *:VOS:*:*)
 	# From Paul.Green at stratus.com.
 	echo hppa1.1-stratus-vos
-	exit ;;
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit ;;
+	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit ;;
+	exit 0 ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit ;;
+	exit 0 ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit ;;
+	exit 0 ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1186,7 +1182,7 @@
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1194,25 +1190,22 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit ;;
+	exit 0 ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit ;;
+	exit 0 ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1223,44 +1216,38 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
+	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit ;;
+	exit 0 ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit ;;
+	exit 0 ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit ;;
+	exit 0 ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit ;;
+	exit 0 ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit ;;
+	exit 0 ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit ;;
+	exit 0 ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
+	exit 0 ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
+	esac
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1292,7 +1279,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1381,12 +1368,11 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1395,22 +1381,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit ;;
+	exit 0 ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     c34*)
 	echo c34-convex-bsd
-	exit ;;
+	exit 0 ;;
     c38*)
 	echo c38-convex-bsd
-	exit ;;
+	exit 0 ;;
     c4*)
 	echo c4-convex-bsd
-	exit ;;
+	exit 0 ;;
     esac
 fi
 
@@ -1421,9 +1407,7 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+    ftp://ftp.gnu.org/pub/gnu/config/
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be


Index: config.sub
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.sub,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config.sub	9 Feb 2007 22:33:58 -0000	1.10
+++ config.sub	9 Feb 2007 23:28:19 -0000	1.11
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2004-08-29'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,15 +21,14 @@
 #
 # 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.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -71,7 +70,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -84,11 +83,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -100,7 +99,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
        break ;;
@@ -232,14 +231,13 @@
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -248,7 +246,6 @@
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -257,28 +254,23 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| or32 \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -306,7 +298,7 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bfin-* | bs2000-* \
+	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -318,7 +310,7 @@
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -327,7 +319,6 @@
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -336,7 +327,6 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -344,23 +334,20 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -502,10 +489,6 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -771,8 +754,9 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	openrisc | openrisc-*)
+	or32 | or32-*)
 		basic_machine=or32-unknown
+		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1045,10 +1029,6 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1098,9 +1078,12 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1187,8 +1170,7 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1206,7 +1188,7 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1315,9 +1297,6 @@
 	-kaos*)
 		os=-kaos
 		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
 	-none)
 		;;
 	*)
@@ -1395,9 +1374,6 @@
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1569,7 +1545,7 @@
 esac
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.25 -r 1.26 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- configure	9 Feb 2007 22:33:58 -0000	1.25
+++ configure	9 Feb 2007 23:28:19 -0000	1.26
@@ -280,15 +280,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL initdir SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
 XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL initdir SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1039,6 +1039,7 @@
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-debug         Enable debug features
+  --enable-bundle      Enable bundled dependencies
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3819,13 +3820,12 @@
     done
   done
 done
-IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
+  test ! -f $lt_ac_sed && break
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -3850,11 +3850,10 @@
     fi
   done
 done
+SED=$lt_cv_path_SED
 
 fi
 
-SED=$lt_cv_path_SED
-
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -3931,7 +3930,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
+      # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -3965,7 +3964,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -3995,15 +3994,6 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -4014,43 +4004,36 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      # Check to see if the nm accepts a BSD-compat flag.
+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      # Tru64's nm complains that /dev/null is an invalid object file
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
+	lt_cv_path_NM="$tmp_nm -B"
+	break
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
 	  break
 	  ;;
 	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
 	  ;;
 	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
+      esac
+    fi
   done
+  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -4097,7 +4080,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi[45]*)
+bsdi4*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
@@ -4120,13 +4103,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | kfreebsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -4142,7 +4125,7 @@
[...14254 lines suppressed...]
 link_all_deplibs=$link_all_deplibs_GCJ
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18254,42 +18815,15 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 compiler_RC=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
 lt_cv_prog_compiler_c_o_RC=yes
 
 # The else clause should only fire when bootstrapping the
@@ -18305,7 +18839,7 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18406,12 +18940,6 @@
 # The host system.
 host_alias=$host_alias
 host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -18423,18 +18951,12 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
 # A language-specific compiler.
 CC=$lt_compiler_RC
 
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18494,7 +19016,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 
-# Must we lock files when doing compilation?
+# Must we lock files when doing compilation ?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -18568,11 +19090,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18584,7 +19106,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18664,7 +19186,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -22873,6 +23395,35 @@
 fi;
 
 
+# Used for legacy style packaging where we bundle all of the dependencies.
+echo "$as_me:$LINENO: checking for --enable-bundle" >&5
+echo $ECHO_N "checking for --enable-bundle... $ECHO_C" >&6
+# Check whether --enable-bundle or --disable-bundle was given.
+if test "${enable_bundle+set}" = set; then
+  enableval="$enable_bundle"
+
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  bundle="1";
+
+else
+
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  bundle="";
+
+fi;
+
+
+if test "$bundle" = "1"; then
+  BUNDLE_TRUE=
+  BUNDLE_FALSE='#'
+else
+  BUNDLE_TRUE='#'
+  BUNDLE_FALSE=
+fi
+
+
 
 
 # installation paths - by default, configure will just
@@ -24981,6 +25532,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BUNDLE_TRUE}" && test -z "${BUNDLE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUNDLE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUNDLE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${WINNT_TRUE}" && test -z "${WINNT_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"WINNT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -25582,7 +26140,6 @@
 s, at CCDEPMODE@,$CCDEPMODE,;t t
 s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at SED@,$SED,;t t
 s, at EGREP@,$EGREP,;t t
 s, at LN_S@,$LN_S,;t t
 s, at ECHO@,$ECHO,;t t
@@ -25598,6 +26155,8 @@
 s, at LIBTOOL@,$LIBTOOL,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t
 s, at debug_defs@,$debug_defs,;t t
+s, at BUNDLE_TRUE@,$BUNDLE_TRUE,;t t
+s, at BUNDLE_FALSE@,$BUNDLE_FALSE,;t t
 s, at configdir@,$configdir,;t t
 s, at sampledatadir@,$sampledatadir,;t t
 s, at propertydir@,$propertydir,;t t


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.ac	9 Feb 2007 22:33:58 -0000	1.16
+++ configure.ac	9 Feb 2007 23:28:19 -0000	1.17
@@ -59,6 +59,19 @@
 ])
 AC_SUBST([debug_defs])
 
+# Used for legacy style packaging where we bundle all of the dependencies.
+AC_MSG_CHECKING(for --enable-bundle)
+AC_ARG_ENABLE(bundle, [  --enable-bundle      Enable bundled dependencies],
+[
+  AC_MSG_RESULT(yes)
+  bundle="1";
+],
+[
+  AC_MSG_RESULT(no)
+  bundle="";
+])
+AM_CONDITIONAL(BUNDLE,test "$bundle" = "1")
+
 AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
 
 # installation paths - by default, configure will just


Index: depcomp
===================================================================
RCS file: /cvs/dirsec/ldapserver/depcomp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- depcomp	9 Feb 2007 22:33:58 -0000	1.11
+++ depcomp	9 Feb 2007 23:28:19 -0000	1.12
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2004-05-31.23
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
 # 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
@@ -17,8 +17,8 @@
 
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -50,11 +50,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit $?
+    exit 0
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit $?
+    exit 0
     ;;
 esac
 
@@ -287,43 +287,36 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      # Dependencies are output in .lo.d with libtool 1.4.
+      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
+      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
+      # latter, because the former will be cleaned when $dir.libs is
+      # erased.
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir$base.o.d"
+      tmpdepfile3="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      tmpdepfile3="$dir$base.d"
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
       exit $stat
    fi
 
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   elif test -f "$tmpdepfile2"; then
+      tmpdepfile="$tmpdepfile2"
+   else
+      tmpdepfile="$tmpdepfile3"
+   fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -467,8 +460,7 @@
   done
 
   "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"


Index: install-sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/install-sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- install-sh	9 Feb 2007 22:33:58 -0000	1.11
+++ install-sh	9 Feb 2007 23:28:19 -0000	1.12
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2004-09-10.20
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -109,7 +109,7 @@
         shift
         continue;;
 
-    --help) echo "$usage"; exit $?;;
+    --help) echo "$usage"; exit 0;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -134,7 +134,7 @@
 	shift
 	continue;;
 
-    --version) echo "$0 $scriptversion"; exit $?;;
+    --version) echo "$0 $scriptversion"; exit 0;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.
@@ -213,7 +213,7 @@
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -226,8 +226,7 @@
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
     IFS=$oIFS
 
     pathcomp=
@@ -296,7 +295,7 @@
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
+		 (exit 1); exit
 	       }
 	     else
 	       :
@@ -307,12 +306,12 @@
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
     }
-  fi || { (exit 1); exit 1; }
+  fi || { (exit 1); exit; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit 0
+  (exit 0); exit
 }
 
 # Local variables:


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ltmain.sh	8 Feb 2007 18:40:12 -0000	1.7
+++ ltmain.sh	9 Feb 2007 23:28:19 -0000	1.8
@@ -46,16 +46,10 @@
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" ; then
   setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -111,14 +105,12 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-         save_$lt_var=\$$lt_var
-         $lt_var=C
-         export $lt_var
-       fi"
-done
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -144,8 +136,6 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -337,17 +327,7 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-       *" $my_xlib_u "*)
-         extracted_serial=`expr $extracted_serial + 1`
-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
-       *) break ;;
-       esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -778,7 +758,6 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
-    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1159,9 +1138,8 @@
     for arg
     do
       case $arg in
-      -all-static | -static | -static-libtool-libs)
-    case $arg in
-    -all-static)
+      -all-static | -static)
+	if test "X$arg" = "X-all-static"; then
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1169,20 +1147,12 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	  ;;
-    -static)
+	else
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	  ;;
-    -static-libtool-libs)
-      if test -z "$pic_flag" && test -n "$link_static_flag"; then
-        dlopen_self=$dlopen_self_static
-      fi
-      prefer_static_libs=yes
-      ;;
-    esac
+	fi
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1742,7 +1712,7 @@
 	continue
 	;;
 
-      -static | -static-libtool-libs)
+      -static)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2520,9 +2490,7 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-         { { test "$prefer_static_libs" = no ||
-             test "$prefer_static_libs,$installed" = "built,yes"; } ||
-           test -z "$old_library"; }; then
+	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3218,7 +3186,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows|none)
+	  darwin|linux|osf|windows)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3442,11 +3410,11 @@
       fi
 
       # Eliminate all temporary directories.
-#      for path in $notinst_path; do
-#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-#      done
+      for path in $notinst_path; do
+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3547,12 +3515,13 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+	  if test "$?" -eq 0 ; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
+              if test "$name" != "" && test "$name" -ne "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3591,7 +3560,9 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		$LTCC $LTCFLAGS -o conftest conftest.c $i
+		# Did it work?
+		if test "$?" -eq 0 ; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3623,7 +3594,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
+		  $echo "***  make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4268,14 +4239,12 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
+      # -Wl from whole_archive_flag_spec
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4723,16 +4692,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
             else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
             ;;
           esac
 	  ;;
@@ -4747,13 +4716,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4840,7 +4809,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4877,7 +4846,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi
 
       # Quote $echo for shipping.
@@ -5284,18 +5253,6 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5438,7 +5395,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5624,7 +5581,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5969,9 +5926,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6180,7 +6137,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6456,15 +6413,12 @@
       fi
 
       # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-       eval "if test \"\${save_$lt_var+set}\" = set; then
-               $lt_var=\$save_$lt_var; export $lt_var
-             else
-               $lt_unset $lt_var
-             fi"
-      done
-
+      if test "${save_LC_ALL+set}" = set; then
+	LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+	LANG="$save_LANG"; export LANG
+      fi
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6821,9 +6775,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
+		    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
+		    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6837,11 +6791,9 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
+		    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 


Index: missing
===================================================================
RCS file: /cvs/dirsec/ldapserver/missing,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- missing	9 Feb 2007 22:33:58 -0000	1.11
+++ missing	9 Feb 2007 23:28:19 -0000	1.12
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2004-09-07.08
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
@@ -19,8 +19,8 @@
 
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake at gnu.org>."
-    exit $?
+    exit 0
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
-    exit $?
+    exit 0
     ;;
 
   -*)
@@ -288,18 +288,11 @@
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
     touch $file
     ;;
 



From fedora-directory-commits at redhat.com  Mon Feb 12 19:39:11 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 12 Feb 2007 14:39:11 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
	ds_newinst.pl.in, 1.3, 1.4
Message-ID: <200702121939.l1CJdBJu021231@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21168/ldapserver/ldap/admin/src

Modified Files:
	ds_newinst.pl.in 
Log Message:
Resolves: bug 227771
Bug Description: FHS: use sysconfdir (/etc) as config file location - allow builders to set dynamic config directory location at configure time
Reviewed by: nhosoi, nkinder, prowley (Thanks!)
Fix Description: I've added a new configure switch: --with-instconfigdir.  This switch will allow the user to specify a different location to store the dynamic instance specific config files rather than the default $sysconfdir/$package_name (e.g. /etc/fedora-ds).  This is the directory which will contain the slapd-instance directories which contain the instance specific config, schema, and security files.  Even though the user could override this with ds_newinst.pl ([slapd] section config_dir), we needed to be able to set the default so that the user would not have to remember to do this every time, and so that packagers could set a reasonable default value for their platform.
Platforms tested: FC6, RHEL4
Flag Day: no
Doc impact: no



Index: ds_newinst.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ds_newinst.pl.in	9 Feb 2007 22:33:59 -0000	1.3
+++ ds_newinst.pl.in	12 Feb 2007 19:39:04 -0000	1.4
@@ -194,10 +194,13 @@
 $cgiargs{"datadir"} = $table{"slapd"}->{"datadir"};
 $cgiargs{"docdir"} = $table{"slapd"}->{"docdir"};
 $cgiargs{"inst_dir"} = $table{"slapd"}->{"inst_dir"};
-$cgiargs{"config_dir"} = $table{"slapd"}->{"config_dir"};
 $cgiargs{"schema_dir"} = $table{"slapd"}->{"schema_dir"};
 $cgiargs{"sasl_path"} = $table{"slapd"}->{"sasl_path"};
-
+if ($table{"slapd"}->{"config_dir"}) {
+    $cgiargs{"config_dir"} = $table{"slapd"}->{"config_dir"};
+} else {
+    $cgiargs{"config_dir"} = "@instconfigdir@/slapd-" . $table{"slapd"}->{"ServerIdentifier"};
+}
 # port number for Admin Server - used to configure some web apps
 $cgiargs{adminport} = $table{admin}->{Port};
 



From fedora-directory-commits at redhat.com  Mon Feb 12 19:39:11 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 12 Feb 2007 14:39:11 -0500
Subject: [Fedora-directory-commits] ldapserver/wrappers initscript.in, 1.1,
	1.2
Message-ID: <200702121939.l1CJdBRM021237@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21168/ldapserver/wrappers

Modified Files:
	initscript.in 
Log Message:
Resolves: bug 227771
Bug Description: FHS: use sysconfdir (/etc) as config file location - allow builders to set dynamic config directory location at configure time
Reviewed by: nhosoi, nkinder, prowley (Thanks!)
Fix Description: I've added a new configure switch: --with-instconfigdir.  This switch will allow the user to specify a different location to store the dynamic instance specific config files rather than the default $sysconfdir/$package_name (e.g. /etc/fedora-ds).  This is the directory which will contain the slapd-instance directories which contain the instance specific config, schema, and security files.  Even though the user could override this with ds_newinst.pl ([slapd] section config_dir), we needed to be able to set the default so that the user would not have to remember to do this every time, and so that packagers could set a reasonable default value for their platform.
Platforms tested: FC6, RHEL4
Flag Day: no
Doc impact: no



Index: initscript.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- initscript.in	9 Feb 2007 22:33:59 -0000	1.1
+++ initscript.in	12 Feb 2007 19:39:09 -0000	1.2
@@ -30,7 +30,7 @@
 # PID directory
 piddir="@localstatedir@/run/@package_name@"
 # Instance basedir
-instbase="@sysconfdir@/@package_name@"
+instbase="@instconfigdir@"
 
 
 [ -f $exec ] || exit 0
@@ -43,8 +43,10 @@
 INSTANCES=""
 
 for FILE in `/bin/ls -d $instbase/slapd-* 2>/dev/null`; do
-    INSTANCES+=$(echo "$FILE" | sed -e "s|$instbase/slapd-||")
-    INSTANCES+=" "
+    if [ -d "$FILE" ] ; then
+        INSTANCES+=$(echo "$FILE" | sed -e "s|$instbase/slapd-||")
+        INSTANCES+=" "
+    fi
 done
 
 if [ -n "$2" ]; then



From fedora-directory-commits at redhat.com  Mon Feb 12 19:39:06 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 12 Feb 2007 14:39:06 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.24,
	1.25 Makefile.in, 1.27, 1.28 aclocal.m4, 1.17, 1.18 compile,
	1.12, 1.13 config.guess, 1.11, 1.12 config.sub, 1.11,
	1.12 configure, 1.26, 1.27 configure.ac, 1.17, 1.18 depcomp,
	1.12, 1.13 install-sh, 1.12, 1.13 ltmain.sh, 1.8, 1.9 missing,
	1.12, 1.13
Message-ID: <200702121939.l1CJdapL021243@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21168/ldapserver

Modified Files:
	Makefile.am Makefile.in aclocal.m4 compile config.guess 
	config.sub configure configure.ac depcomp install-sh ltmain.sh 
	missing 
Log Message:
Resolves: bug 227771
Bug Description: FHS: use sysconfdir (/etc) as config file location - allow builders to set dynamic config directory location at configure time
Reviewed by: nhosoi, nkinder, prowley (Thanks!)
Fix Description: I've added a new configure switch: --with-instconfigdir.  This switch will allow the user to specify a different location to store the dynamic instance specific config files rather than the default $sysconfdir/$package_name (e.g. /etc/fedora-ds).  This is the directory which will contain the slapd-instance directories which contain the instance specific config, schema, and security files.  Even though the user could override this with ds_newinst.pl ([slapd] section config_dir), we needed to be able to set the default so that the user would not have to remember to do this every time, and so that packagers could set a reasonable default value for their platform.
Platforms tested: FC6, RHEL4
Flag Day: no
Doc impact: no



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.am	9 Feb 2007 23:28:19 -0000	1.24
+++ Makefile.am	12 Feb 2007 19:39:03 -0000	1.25
@@ -67,6 +67,7 @@
 serverplugindir = $(libdir)@serverplugindir@
 taskdir = $(datadir)@scripttemplatedir@
 initdir = $(sysconfdir)@initdir@
+instconfigdir = @instconfigdir@
 
 #------------------------
 # Build Products
@@ -949,7 +950,8 @@
 	-e 's, at configdir\@,$(configdir),g' \
 	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 	-e 's, at localstatedir\@,$(localstatedir),g' \
-	-e 's, at package_name\@,$(PACKAGE_NAME),g'
+	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
+	-e 's, at instconfigdir\@,$(instconfigdir),g'
 else
 fixupcmd = sed \
 	-e 's, at bindir\@,$(bindir),g' \
@@ -972,7 +974,8 @@
 	-e 's, at configdir\@,$(configdir),g' \
 	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 	-e 's, at localstatedir\@,$(localstatedir),g' \
-	-e 's, at package_name\@,$(PACKAGE_NAME),g'
+	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
+	-e 's, at instconfigdir\@,$(instconfigdir),g'
 endif
 
 %: %.in


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.27 -r 1.28 Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.in	9 Feb 2007 23:28:19 -0000	1.27
+++ Makefile.in	12 Feb 2007 19:39:03 -0000	1.28
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +18,6 @@
 
 
 
-SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES!
 ) $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -56,11 +54,11 @@
 	depcomp install-sh ltmain.sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nspr.m4 $(top_srcdir)/m4/nss.m4 \
-	$(top_srcdir)/m4/mozldap.m4 $(top_srcdir)/m4/db.m4 \
-	$(top_srcdir)/m4/sasl.m4 $(top_srcdir)/m4/svrcore.m4 \
-	$(top_srcdir)/m4/icu.m4 $(top_srcdir)/m4/netsnmp.m4 \
-	$(top_srcdir)/m4/fhs.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \
+	$(top_srcdir)/m4/nss.m4 $(top_srcdir)/m4/mozldap.m4 \
+	$(top_srcdir)/m4/db.m4 $(top_srcdir)/m4/sasl.m4 \
+	$(top_srcdir)/m4/svrcore.m4 $(top_srcdir)/m4/icu.m4 \
+	$(top_srcdir)/m4/netsnmp.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -687,19 +685,19 @@
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \
 	$(libacl_plugin_la_SOURCES) \
@@ -830,6 +828,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -885,6 +884,7 @@
 infodir = @infodir@
 initdir = $(sysconfdir)@initdir@
 install_sh = @install_sh@
+instconfigdir = @instconfigdir@
 ldapsdk_bindir = @ldapsdk_bindir@
 ldapsdk_inc = @ldapsdk_inc@
 ldapsdk_lib = @ldapsdk_lib@
@@ -1807,7 +1807,8 @@
 @BUNDLE_FALSE@	-e 's, at configdir\@,$(configdir),g' \
 @BUNDLE_FALSE@	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 @BUNDLE_FALSE@	-e 's, at localstatedir\@,$(localstatedir),g' \
- at BUNDLE_FALSE@	-e 's, at package_name\@,$(PACKAGE_NAME),g'
+ at BUNDLE_FALSE@	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
+ at BUNDLE_FALSE@	-e 's, at instconfigdir\@,$(instconfigdir),g'
 
 
 # these are for the config files and scripts that we need to generate and replace
@@ -1837,7 +1838,8 @@
 @BUNDLE_TRUE@	-e 's, at configdir\@,$(configdir),g' \
 @BUNDLE_TRUE@	-e 's, at sysconfdir\@,$(sysconfdir),g' \
 @BUNDLE_TRUE@	-e 's, at localstatedir\@,$(localstatedir),g' \
- at BUNDLE_TRUE@	-e 's, at package_name\@,$(PACKAGE_NAME),g'
+ at BUNDLE_TRUE@	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
+ at BUNDLE_TRUE@	-e 's, at instconfigdir\@,$(instconfigdir),g'
 
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -5093,2286 +5095,2286 @@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi`
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo: ldap/servers/plugins/acl/acl_ext.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl_ext.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo: ldap/servers/plugins/acl/aclanom.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclanom.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo: ldap/servers/plugins/acl/acleffectiverights.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acleffectiverights.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo: ldap/servers/plugins/acl/aclgroup.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclgroup.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo: ldap/servers/plugins/acl/aclinit.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclinit.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo: ldap/servers/plugins/acl/acllas.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acllas.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo: ldap/servers/plugins/acl/acllist.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acllist.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo: ldap/servers/plugins/acl/aclparse.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclparse.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo: ldap/servers/plugins/acl/aclplugin.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclplugin.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo: ldap/servers/plugins/acl/aclproxy.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \
[...3009 lines suppressed...]
 lib/libaccess/libns_dshttpd_la-nseframe.lo: lib/libaccess/nseframe.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nseframe.cpp' object='lib/libaccess/libns_dshttpd_la-nseframe.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
 
 lib/libaccess/libns_dshttpd_la-nsautherr.lo: lib/libaccess/nsautherr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nsautherr.cpp' object='lib/libaccess/libns_dshttpd_la-nsautherr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
 
 lib/libaccess/libns_dshttpd_la-oneeval.lo: lib/libaccess/oneeval.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/oneeval.cpp' object='lib/libaccess/libns_dshttpd_la-oneeval.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
 
 lib/libaccess/libns_dshttpd_la-register.lo: lib/libaccess/register.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/register.cpp' object='lib/libaccess/libns_dshttpd_la-register.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
 
 lib/libaccess/libns_dshttpd_la-symbols.lo: lib/libaccess/symbols.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/symbols.cpp' object='lib/libaccess/libns_dshttpd_la-symbols.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
 
 lib/libaccess/libns_dshttpd_la-usi.lo: lib/libaccess/usi.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usi.cpp' object='lib/libaccess/libns_dshttpd_la-usi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
 
 lib/libaccess/libns_dshttpd_la-usrcache.lo: lib/libaccess/usrcache.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usrcache.cpp' object='lib/libaccess/libns_dshttpd_la-usrcache.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
 
 lib/base/libns_dshttpd_la-crit.lo: lib/base/crit.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/crit.cpp' object='lib/base/libns_dshttpd_la-crit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
 
 lib/base/libns_dshttpd_la-dns.lo: lib/base/dns.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dns.cpp' object='lib/base/libns_dshttpd_la-dns.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
 
 lib/base/libns_dshttpd_la-dnsdmain.lo: lib/base/dnsdmain.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dnsdmain.cpp' object='lib/base/libns_dshttpd_la-dnsdmain.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
 
 lib/base/libns_dshttpd_la-ereport.lo: lib/base/ereport.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/ereport.cpp' object='lib/base/libns_dshttpd_la-ereport.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
 
 lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
 
 lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
 
 lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
 
 lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
 
 lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
 
 lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
 
 lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
 
 lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
 
 lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
 
 lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
 
 lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.17 -r 1.18 aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aclocal.m4	9 Feb 2007 23:28:19 -0000	1.17
+++ aclocal.m4	12 Feb 2007 19:39:03 -0000	1.18
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +123,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +143,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,6 +163,7 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -182,15 +183,17 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+_LT_CC_BASENAME([$compiler])
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -231,11 +234,56 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
+
+
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -308,15 +356,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -485,7 +533,7 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -536,6 +584,22 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -567,7 +631,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -577,8 +641,10 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
[...3355 lines suppressed...]
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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.
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -6694,27 +7032,16 @@
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -6768,26 +7095,15 @@
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Helper functions for option handling.                     -*- Autoconf -*-
 
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -6812,28 +7128,16 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-#
-# Check to make sure that the build environment is sane.
-#
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_SANITY_CHECK
 # ---------------
@@ -6876,25 +7180,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# AM_PROG_INSTALL_STRIP
+# ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -6917,25 +7210,13 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004  Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------


Index: compile
===================================================================
RCS file: /cvs/dirsec/ldapserver/compile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- compile	9 Feb 2007 23:28:19 -0000	1.12
+++ compile	12 Feb 2007 19:39:03 -0000	1.13
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2004-09-10.20
+scriptversion=2005-05-14.22
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,11 +47,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -125,6 +125,8 @@
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"


Index: config.guess
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.guess,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config.guess	9 Feb 2007 23:28:19 -0000	1.11
+++ config.guess	12 Feb 2007 19:39:03 -0000	1.12
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-09-07'
+timestamp='2005-07-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per at bothner.com>.
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +68,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -123,7 +125,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi at noc.rutgers.edu 1994-08-24)
@@ -196,55 +198,20 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,37 +264,43 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -335,32 +308,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -369,10 +342,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -384,10 +357,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -398,40 +371,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -455,32 +428,33 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -496,29 +470,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -526,7 +500,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -541,14 +515,18 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -562,28 +540,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -645,9 +623,19 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -655,11 +643,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -687,158 +675,166 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
+	exit ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -856,7 +852,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -875,14 +871,14 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -896,7 +892,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -904,25 +900,25 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -940,15 +936,15 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -976,15 +972,18 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -992,27 +991,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1020,15 +1019,16 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1046,73 +1046,73 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1120,61 +1120,65 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel at ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf at swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green at stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1182,7 +1186,7 @@
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1190,22 +1194,25 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1216,38 +1223,44 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1279,7 +1292,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1368,11 +1381,12 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1381,22 +1395,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1407,7 +1421,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be


Index: config.sub
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.sub,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config.sub	9 Feb 2007 23:28:19 -0000	1.11
+++ config.sub	12 Feb 2007 19:39:03 -0000	1.12
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-08-29'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@
 #
 # 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -231,13 +232,14 @@
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -246,6 +248,7 @@
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -254,23 +257,28 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -298,7 +306,7 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -310,7 +318,7 @@
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -319,6 +327,7 @@
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -327,6 +336,7 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -334,20 +344,23 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -489,6 +502,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -754,9 +771,8 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1029,6 +1045,10 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1078,12 +1098,9 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1170,7 +1187,8 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1188,7 +1206,7 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1297,6 +1315,9 @@
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1374,6 +1395,9 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1545,7 +1569,7 @@
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.26 -r 1.27 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure	9 Feb 2007 23:28:19 -0000	1.26
+++ configure	12 Feb 2007 19:39:03 -0000	1.27
@@ -280,15 +280,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
 XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL initdir SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL initdir SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1049,6 +1049,8 @@
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
+  --with-fhs   Use FHS layout
+  --with-instconfigdir=/path   Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)
   --with-nspr=PATH        Netscape Portable Runtime (NSPR) directory
   --with-nspr-inc=PATH        Netscape Portable Runtime (NSPR) include file directory
   --with-nspr-lib=PATH        Netscape Portable Runtime (NSPR) library directory
@@ -1072,7 +1074,6 @@
   --with-netsnmp=PATH   Net-SNMP directory
   --with-netsnmp-inc=PATH     Net-SNMP include directory
   --with-netsnmp-lib=PATH     Net-SNMP library directory
-  --with-fhs   Use FHS layout
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -3820,12 +3821,13 @@
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -3850,10 +3852,11 @@
     fi
   done
 done
-SED=$lt_cv_path_SED
 
 fi
 
+SED=$lt_cv_path_SED
+
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -3930,7 +3933,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -3964,7 +3967,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -3994,6 +3997,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -4004,36 +4016,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
 	  break
 	  ;;
 	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
 	  ;;
 	esac
-      esac
-    fi
+      fi
+    done
+    IFS="$lt_save_ifs"
   done
-  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -4080,7 +4099,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[45]*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
@@ -4103,13 +4122,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
[...9394 lines suppressed...]
 
@@ -19016,7 +18496,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -19090,11 +18570,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -19106,7 +18586,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -19186,7 +18666,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23426,6 +22906,54 @@
 
 
 
+# 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
+
+{ echo "$as_me:$LINENO: checking for FHS..." >&5
+echo "$as_me: checking for FHS..." >&6;}
+
+# check for --with-fhs
+echo "$as_me:$LINENO: checking for --with-fhs" >&5
+echo $ECHO_N "checking for --with-fhs... $ECHO_C" >&6
+
+# Check whether --with-fhs or --without-fhs was given.
+if test "${with_fhs+set}" = set; then
+  withval="$with_fhs"
+
+  with_fhs=yes
+
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+if test "$with_fhs" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define IS_FHS 1
+_ACEOF
+
+fi
+
+
+
 # installation paths - by default, configure will just
 # use /usr as the prefix for everything, which means
 # /usr/etc and /usr/var.  FHS sez to use /etc and /var.
@@ -23459,6 +22987,32 @@
 
 
 
+
+{ echo "$as_me:$LINENO: checking for instconfigdir..." >&5
+echo "$as_me: checking for instconfigdir..." >&6;}
+
+# check for --with-instconfigdir
+echo "$as_me:$LINENO: checking for --with-instconfigdir" >&5
+echo $ECHO_N "checking for --with-instconfigdir... $ECHO_C" >&6
+
+# Check whether --with-instconfigdir or --without-instconfigdir was given.
+if test "${with_instconfigdir+set}" = set; then
+  withval="$with_instconfigdir"
+
+  if test $withval = yes ; then
+     { { echo "$as_me:$LINENO: error: Please specify a full path with --with-instconfigdir" >&5
+echo "$as_me: error: Please specify a full path with --with-instconfigdir" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  instconfigdir="$withval"
+
+else
+
+    instconfigdir='$(sysconfdir)/$(PACKAGE_NAME)'
+
+fi;
+
+
 # WINNT should be true if building on Windows system not using
 # cygnus, mingw, or the like and using cmd.exe as the shell
 
@@ -25321,53 +24875,6 @@
    { (exit 1); exit 1; }; }
 fi
 
-# 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
-
-{ echo "$as_me:$LINENO: checking for FHS..." >&5
-echo "$as_me: checking for FHS..." >&6;}
-
-# check for --with-fhs
-echo "$as_me:$LINENO: checking for --with-fhs" >&5
-echo $ECHO_N "checking for --with-fhs... $ECHO_C" >&6
-
-# Check whether --with-fhs or --without-fhs was given.
-if test "${with_fhs+set}" = set; then
-  withval="$with_fhs"
-
-  with_fhs=yes
-
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi;
-
-if test "$with_fhs" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define IS_FHS 1
-_ACEOF
-
-fi
-
-
 
 # write out paths for binary components
 
@@ -26140,6 +25647,7 @@
 s, at CCDEPMODE@,$CCDEPMODE,;t t
 s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s, at SED@,$SED,;t t
 s, at EGREP@,$EGREP,;t t
 s, at LN_S@,$LN_S,;t t
 s, at ECHO@,$ECHO,;t t
@@ -26164,6 +25672,7 @@
 s, at serverdir@,$serverdir,;t t
 s, at serverplugindir@,$serverplugindir,;t t
 s, at scripttemplatedir@,$scripttemplatedir,;t t
+s, at instconfigdir@,$instconfigdir,;t t
 s, at WINNT_TRUE@,$WINNT_TRUE,;t t
 s, at WINNT_FALSE@,$WINNT_FALSE,;t t
 s, at LIBSOCKET@,$LIBSOCKET,;t t


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.ac	9 Feb 2007 23:28:19 -0000	1.17
+++ configure.ac	12 Feb 2007 19:39:03 -0000	1.18
@@ -74,6 +74,8 @@
 
 AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
 
+m4_include(m4/fhs.m4)
+
 # installation paths - by default, configure will just
 # use /usr as the prefix for everything, which means
 # /usr/etc and /usr/var.  FHS sez to use /etc and /var.
@@ -101,6 +103,7 @@
 serverplugindir=/$PACKAGE_NAME/plugins
 # relative to datadir
 scripttemplatedir=/$PACKAGE_NAME/script-templates
+
 AC_SUBST(configdir)
 AC_SUBST(sampledatadir)
 AC_SUBST(propertydir)
@@ -109,6 +112,23 @@
 AC_SUBST(serverplugindir)
 AC_SUBST(scripttemplatedir)
 
+AC_CHECKING(for instconfigdir)
+
+# check for --with-instconfigdir
+AC_MSG_CHECKING(for --with-instconfigdir)
+AC_ARG_WITH(instconfigdir, [  --with-instconfigdir=/path   Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)],
+[
+  if test $withval = yes ; then
+     AC_ERROR([Please specify a full path with --with-instconfigdir])
+  fi
+  instconfigdir="$withval"
+],
+[
+  dnl this value is expanded out in Makefile.am
+  instconfigdir='$(sysconfdir)/$(PACKAGE_NAME)'
+])
+AC_SUBST(instconfigdir)
+
 # WINNT should be true if building on Windows system not using
 # cygnus, mingw, or the like and using cmd.exe as the shell
 AM_CONDITIONAL([WINNT], false)
@@ -187,7 +207,6 @@
 m4_include(m4/svrcore.m4)
 m4_include(m4/icu.m4)
 m4_include(m4/netsnmp.m4)
-m4_include(m4/fhs.m4)
 
 # write out paths for binary components
 AC_SUBST(nspr_inc)


Index: depcomp
===================================================================
RCS file: /cvs/dirsec/ldapserver/depcomp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- depcomp	9 Feb 2007 23:28:19 -0000	1.12
+++ depcomp	12 Feb 2007 19:39:03 -0000	1.13
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2004-05-31.23
+scriptversion=2005-07-09.11
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # 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
@@ -17,8 +17,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -50,11 +50,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -287,36 +287,43 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mecanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
       "$@" -Wc,-MD
    else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
       exit $stat
    fi
 
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -460,7 +467,8 @@
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"


Index: install-sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/install-sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- install-sh	9 Feb 2007 23:28:19 -0000	1.12
+++ install-sh	12 Feb 2007 19:39:03 -0000	1.13
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-09-10.20
+scriptversion=2005-05-14.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -109,7 +109,7 @@
         shift
         continue;;
 
-    --help) echo "$usage"; exit 0;;
+    --help) echo "$usage"; exit $?;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -134,7 +134,7 @@
 	shift
 	continue;;
 
-    --version) echo "$0 $scriptversion"; exit 0;;
+    --version) echo "$0 $scriptversion"; exit $?;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.
@@ -213,7 +213,7 @@
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -226,7 +226,8 @@
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
     IFS=$oIFS
 
     pathcomp=
@@ -295,7 +296,7 @@
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit
+		 (exit 1); exit 1
 	       }
 	     else
 	       :
@@ -306,12 +307,12 @@
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
     }
-  fi || { (exit 1); exit; }
+  fi || { (exit 1); exit 1; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit
+  (exit 0); exit 0
 }
 
 # Local variables:


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ltmain.sh	9 Feb 2007 23:28:19 -0000	1.8
+++ ltmain.sh	12 Feb 2007 19:39:03 -0000	1.9
@@ -46,10 +46,16 @@
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -105,12 +111,14 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+         save_$lt_var=\$$lt_var
+         $lt_var=C
+         export $lt_var
+       fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +144,8 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -327,7 +337,17 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         extracted_serial=`expr $extracted_serial + 1`
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+    case $arg in
+    -all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1169,20 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+    -static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+    -static-libtool-libs)
+      if test -z "$pic_flag" && test -n "$link_static_flag"; then
+        dlopen_self=$dlopen_self_static
+      fi
+      prefer_static_libs=yes
+      ;;
+    esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1712,7 +1742,7 @@
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+         { { test "$prefer_static_libs" = no ||
+             test "$prefer_static_libs,$installed" = "built,yes"; } ||
+           test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3410,11 +3442,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+#      for path in $notinst_path; do
+#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+#      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3591,7 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4239,12 +4268,14 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4747,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4877,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5624,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +5969,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+               $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
+
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6837,11 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 


Index: missing
===================================================================
RCS file: /cvs/dirsec/ldapserver/missing,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- missing	9 Feb 2007 23:28:19 -0000	1.12
+++ missing	12 Feb 2007 19:39:03 -0000	1.13
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2004-09-07.08
+scriptversion=2005-06-08.21
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
@@ -19,8 +19,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake at gnu.org>."
-    exit 0
+    exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
-    exit 0
+    exit $?
     ;;
 
   -*)
@@ -288,11 +288,18 @@
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
     touch $file
     ;;
 



From fedora-directory-commits at redhat.com  Mon Feb 12 19:55:12 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 12 Feb 2007 14:55:12 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
	template-bak2db.in, 1.4, 1.5 template-bak2db.pl.in, 1.3,
	1.4 template-cl-dump.pl.in, 1.3, 1.4 template-db2bak.in, 1.4,
	1.5 template-db2bak.pl.in, 1.3, 1.4 template-db2index.in, 1.4,
	1.5 template-db2index.pl.in, 1.3, 1.4 template-db2ldif.in, 1.4,
	1.5 template-db2ldif.pl.in, 1.3, 1.4 template-ldif2db.in, 1.4,
	1.5 template-ldif2db.pl.in, 1.3, 1.4 template-ldif2ldap.in,
	1.3, 1.4 template-monitor.in, 1.3,
	1.4 template-ns-accountstatus.pl.in, 1.3,
	1.4 template-ns-activate.pl.in, 1.3,
	1.4 template-ns-inactivate.pl.in, 1.3,
	1.4 template-ns-newpwpolicy.pl.in, 1.3,
	1.4 template-repl-monitor-cgi.pl.in, 1.3,
	1.4 template-repl-monitor.pl.in, 1.2,
	1.3 template-restoreconfig.in, 1.4, 1.5 template-saveconfig.in,
	1.4, 1.5 template-start-slapd.in, 1.6,
	1.7 template-stop-slapd.in, 1.6,
	1.7 template-suffix2instance.in, 1.4,
	1.5 template-upgradedb.in, 1.4, 1.5 template-verify-db.pl.in,
	1.5, 1.6 template-vlvindex.in, 1.4, 1.5
Message-ID: <200702121955.l1CJtCiI021651@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21583

Modified Files:
	template-bak2db.in template-bak2db.pl.in 
	template-cl-dump.pl.in template-db2bak.in 
	template-db2bak.pl.in template-db2index.in 
	template-db2index.pl.in template-db2ldif.in 
	template-db2ldif.pl.in template-ldif2db.in 
	template-ldif2db.pl.in template-ldif2ldap.in 
	template-monitor.in template-ns-accountstatus.pl.in 
	template-ns-activate.pl.in template-ns-inactivate.pl.in 
	template-ns-newpwpolicy.pl.in template-repl-monitor-cgi.pl.in 
	template-repl-monitor.pl.in template-restoreconfig.in 
	template-saveconfig.in template-start-slapd.in 
	template-stop-slapd.in template-suffix2instance.in 
	template-upgradedb.in template-verify-db.pl.in 
	template-vlvindex.in 
Log Message:
make sure .in files are newer than corresponding template script file

























































From fedora-directory-commits at redhat.com  Mon Feb 12 20:10:23 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 12 Feb 2007 15:10:23 -0500
Subject: [Fedora-directory-commits] ldapserver/wrappers initscript.in, 1.2,
	1.3
Message-ID: <200702122010.l1CKANEB025215@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25199

Modified Files:
	initscript.in 
Log Message:
Remove some bash-isms that were causing problems on RHEL-4



Index: initscript.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- initscript.in	12 Feb 2007 19:39:09 -0000	1.2
+++ initscript.in	12 Feb 2007 20:10:21 -0000	1.3
@@ -44,14 +44,14 @@
 
 for FILE in `/bin/ls -d $instbase/slapd-* 2>/dev/null`; do
     if [ -d "$FILE" ] ; then
-        INSTANCES+=$(echo "$FILE" | sed -e "s|$instbase/slapd-||")
-        INSTANCES+=" "
+        inst=$(echo "$FILE" | sed -e "s|$instbase/slapd-||")
+        INSTANCES="$INSTANCES $inst"
     fi
 done
 
 if [ -n "$2" ]; then
    for I in $INSTANCES; do
-      if [ "$2" == "$I" ]; then
+      if [ "$2" = "$I" ]; then
          INSTANCES="$2"
       fi
    done



From fedora-directory-commits at redhat.com  Mon Feb 12 21:13:15 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 12 Feb 2007 16:13:15 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm
	dblayer.c, 1.16, 1.17 perfctrs.c, 1.5, 1.6
Message-ID: <200702122113.l1CLDFog029131@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29096/ldapserver/ldap/servers/slapd/back-ldbm

Modified Files:
	dblayer.c perfctrs.c 
Log Message:
Resolves: bug 228334
Bug Description: Allow building with bdb 4.4 or later
Reviewed by: nkinder (Thanks!)
Fix Description: db.m4 already had code to detect and use the correct version of db headers and libraries.  There have been some minor api changes since 4.3, so not much code changes were required.  Note that this merely allows the server to build and run with db4.4 or later, not to take advantage of the newer features of the API.
Platforms tested: FC7
Flag Day: no
Doc impact: no



Index: dblayer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dblayer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dblayer.c	2 Dec 2006 00:14:25 -0000	1.16
+++ dblayer.c	12 Feb 2007 21:13:07 -0000	1.17
@@ -122,8 +122,6 @@
 
 #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000
 #define DB_ENV_SET_REGION_INIT(env) (env)->set_flags((env), DB_REGION_INIT, 1)
-#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
-    (env)->set_tas_spins((env), (tas_spins))
 #define TXN_BEGIN(env, parent_txn, tid, flags) \
     (env)->txn_begin((env), (parent_txn), (tid), (flags))
 #define TXN_COMMIT(txn, flags) (txn)->commit((txn), (flags))
@@ -139,7 +137,13 @@
 #define LOG_FLUSH(env, lsn) (env)->log_flush((env), (lsn))
 #define LOCK_DETECT(env, flags, atype, aborted) \
     (env)->lock_detect((env), (flags), (atype), (aborted))
-
+#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+    (env)->mutex_set_tas_spins((env), (tas_spins))
+#else /* < 4.4 */
+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+    (env)->set_tas_spins((env), (tas_spins))
+#endif /* 4.4 or later */
 #else    /* older than db 4.0 */
 #define DB_ENV_SET_REGION_INIT(env) db_env_set_region_init(1)
 #define DB_ENV_SET_TAS_SPINS(env, tas_spins) \


Index: perfctrs.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/perfctrs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perfctrs.c	10 Nov 2006 23:45:39 -0000	1.5
+++ perfctrs.c	12 Feb 2007 21:13:07 -0000	1.6
@@ -53,6 +53,11 @@
 #define LOG_STAT(env, spp, flags, malloc) (env)->log_stat((env), (spp), (flags))
 #define LOCK_STAT(env, statp, flags, malloc) \
 	(env)->lock_stat((env), (statp), (flags))
+#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
+#define GET_N_LOCK_WAITS(lockstat)   lockstat->st_lock_wait
+#else
+#define GET_N_LOCK_WAITS(lockstat)   lockstat->st_nconflicts
+#endif
 
 #else	/* older than db 4.0 */
 #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 3300
@@ -60,13 +65,14 @@
 #define MEMP_STAT(env, gsp, fsp, flags, malloc) memp_stat((env), (gsp), (fsp))
 #define LOG_STAT(env, spp, flags, malloc) log_stat((env), (spp))
 #define LOCK_STAT(env, statp, flags, malloc) lock_stat((env), (statp))
-
+#define GET_N_LOCK_WAITS(lockstat)   lockstat->st_nconflicts
 #else	/* older than db 3.3 */
 #define TXN_STAT(env, statp, flags, malloc) txn_stat((env), (statp), (malloc))
 #define MEMP_STAT(env, gsp, fsp, flags, malloc) 
 	memp_stat((env), (gsp), (fsp), (malloc))
 #define LOG_STAT(env, spp, flags, malloc) log_stat((env), (spp), (malloc))
 #define LOCK_STAT(env, statp, flags, malloc) lock_stat((env), (statp), (malloc))
+#define GET_N_LOCK_WAITS(lockstat)   lockstat->st_nconflicts
 #endif
 #endif
 
@@ -312,7 +318,7 @@
 			perf->current_locks = lockstat->st_nlocks;
 			perf->max_locks = lockstat->st_maxnlocks;
 			perf->lockers = lockstat->st_nlockers;
-			perf->lock_conflicts = lockstat->st_nconflicts;
+			perf->lock_conflicts = GET_N_LOCK_WAITS(lockstat);
 			perf->lock_request_rate = lockstat->st_nrequests;			
 			perf->current_lock_objects = lockstat->st_nobjects;
 			perf->max_lock_objects = lockstat->st_maxnobjects;



From fedora-directory-commits at redhat.com  Mon Feb 12 21:13:09 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 12 Feb 2007 16:13:09 -0500
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/servers/plugins/replication cl5_api.c, 1.12, 1.13
Message-ID: <200702122113.l1CLDdRc029149@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29096/ldapserver/ldap/servers/plugins/replication

Modified Files:
	cl5_api.c 
Log Message:
Resolves: bug 228334
Bug Description: Allow building with bdb 4.4 or later
Reviewed by: nkinder (Thanks!)
Fix Description: db.m4 already had code to detect and use the correct version of db headers and libraries.  There have been some minor api changes since 4.3, so not much code changes were required.  Note that this merely allows the server to build and run with db4.4 or later, not to take advantage of the newer features of the API.
Platforms tested: FC7
Flag Day: no
Doc impact: no



Index: cl5_api.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cl5_api.c	15 Nov 2006 17:47:58 -0000	1.12
+++ cl5_api.c	12 Feb 2007 21:13:07 -0000	1.13
@@ -112,8 +112,6 @@
 
 #if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000
 #define DB_ENV_SET_REGION_INIT(env) (env)->set_flags((env), DB_REGION_INIT, 1)
-#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
-	(env)->set_tas_spins((env), (tas_spins))
 #define TXN_BEGIN(env, parent_txn, tid, flags) \
     (env)->txn_begin((env), (parent_txn), (tid), (flags))
 #define TXN_COMMIT(txn, flags) (txn)->commit((txn), (flags))
@@ -129,6 +127,13 @@
 #define LOG_FLUSH(env, lsn) (env)->log_flush((env), (lsn))
 #define LOCK_DETECT(env, flags, atype, aborted) \
 	(env)->lock_detect((env), (flags), (atype), (aborted))
+#if DB_VERSION_MINOR >= 4 /* i.e. 4.4 or later */
+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+    (env)->mutex_set_tas_spins((env), (tas_spins))
+#else /* < 4.4 */
+#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
+    (env)->set_tas_spins((env), (tas_spins))
+#endif /* 4.4 or later */
 
 #else	/* older than db 4.0 */
 #define DB_ENV_SET_REGION_INIT(env) db_env_set_region_init(1)



From fedora-directory-commits at redhat.com  Tue Feb 13 19:00:14 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 13 Feb 2007 14:00:14 -0500
Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.18,
	1.19 aclocal.m4, 1.18, 1.19 configure, 1.27, 1.28 missing,
	1.13, 1.14 install-sh, 1.13, 1.14 depcomp, 1.13, 1.14 compile,
	1.13, 1.14 config.sub, 1.12, 1.13 config.guess, 1.12,
	1.13 Makefile.in, 1.28, 1.29
Message-ID: <200702131900.l1DJ0ETr024057@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23957

Modified Files:
	configure.ac aclocal.m4 configure missing install-sh depcomp 
	compile config.sub config.guess Makefile.in 
Log Message:
change version to 1.1.0a1


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.ac	12 Feb 2007 19:39:03 -0000	1.18
+++ configure.ac	13 Feb 2007 19:00:11 -0000	1.19
@@ -1,7 +1,8 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT([fedora-ds], [1.1.0], [http://bugzilla.redhat.com/])
+# This version is the version returned by ns-slapd -v
+AC_INIT([fedora-ds], [1.1.0a1], [http://bugzilla.redhat.com/])
 # AC_CONFIG_HEADER must be called right after AC_INIT.
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])




Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure	12 Feb 2007 19:39:03 -0000	1.27
+++ configure	13 Feb 2007 19:00:11 -0000	1.28
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0.
+# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a1.
 #
 # Report bugs to <http://bugzilla.redhat.com/>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='fedora-ds'
 PACKAGE_TARNAME='fedora-ds'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='fedora-ds 1.1.0'
+PACKAGE_VERSION='1.1.0a1'
+PACKAGE_STRING='fedora-ds 1.1.0a1'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
 
 # Factoring default headers for most tests.
@@ -954,7 +954,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures fedora-ds 1.1.0 to adapt to many kinds of systems.
+\`configure' configures fedora-ds 1.1.0a1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fedora-ds 1.1.0:";;
+     short | recursive ) echo "Configuration of fedora-ds 1.1.0a1:";;
    esac
   cat <<\_ACEOF
 
@@ -1188,7 +1188,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-fedora-ds configure 1.1.0
+fedora-ds configure 1.1.0a1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1202,7 +1202,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fedora-ds $as_me 1.1.0, which was
+It was created by fedora-ds $as_me 1.1.0a1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1848,7 +1848,7 @@
 
 # Define the identity of the package.
  PACKAGE='fedora-ds'
- VERSION='1.1.0'
+ VERSION='1.1.0a1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -25331,7 +25331,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by fedora-ds $as_me 1.1.0, which was
+This file was extended by fedora-ds $as_me 1.1.0a1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25394,7 +25394,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-fedora-ds config.status 1.1.0
+fedora-ds config.status 1.1.0a1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

















From fedora-directory-commits at redhat.com  Wed Feb 14 00:46:31 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Tue, 13 Feb 2007 19:46:31 -0500
Subject: [Fedora-directory-commits] 
	coolkey/src/libckyapplet Makefile.am, 1.4,
	1.5 Makefile.in, 1.9, 1.10
Message-ID: <200702140046.l1E0kVCM019738@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19672/src/libckyapplet

Modified Files:
	Makefile.am Makefile.in 
Log Message:


Make file clean up:
  don't distribute .a and .la files.
  fix build problem when --enable-pk11install is not set.
  Add dist values so make dist includes the correct files.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	30 Nov 2006 22:35:28 -0000	1.4
+++ Makefile.am	14 Feb 2007 00:46:29 -0000	1.5
@@ -23,6 +23,12 @@
 
 AM_CFLAGS =
 
+EXTRA_DIST = \
+	cky_list.i \
+	dynlink_win.c \
+	dynlink_unix.c \
+	dynlink_mac.c
+
 # bleh what do I add just to get static but pic libraries?
 bogusdir = $(libdir)/bogus
 lib_LTLIBRARIES = libckyapplet.la
@@ -50,5 +56,10 @@
 	cky_basei.h \
 	dynlink.h 
 
+# remove the static and libtool libraries 
+install-data-hook:
+	rm -f $(DESTDIR)$(libdir)/libckyapplet.a
+	rm -f $(DESTDIR)$(libdir)/libckyapplet.la
+
 pcdir = $(libdir)/pkgconfig
 pc_DATA = libckyapplet.pc


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in	30 Nov 2006 22:35:28 -0000	1.9
+++ Makefile.in	14 Feb 2007 00:46:29 -0000	1.10
@@ -233,6 +233,12 @@
 target_vendor = @target_vendor@
 SUBDIRS = 
 AM_CFLAGS = 
+EXTRA_DIST = \
+	cky_list.i \
+	dynlink_win.c \
+	dynlink_unix.c \
+	dynlink_mac.c
+
 
 # bleh what do I add just to get static but pic libraries?
 bogusdir = $(libdir)/bogus
@@ -667,6 +673,8 @@
 info-am:
 
 install-data-am: install-nobase_includeHEADERS install-pcDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-exec-am: install-libLTLIBRARIES
 
@@ -705,17 +713,22 @@
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-recursive distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-nobase_includeHEADERS install-pcDATA install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
+	install-data-am install-data-hook install-exec install-exec-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-man install-nobase_includeHEADERS install-pcDATA \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-info-am uninstall-libLTLIBRARIES \
 	uninstall-nobase_includeHEADERS uninstall-pcDATA
 
+
+# remove the static and libtool libraries 
+install-data-hook:
+	rm -f $(DESTDIR)$(libdir)/libckyapplet.a
+	rm -f $(DESTDIR)$(libdir)/libckyapplet.la
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:



From fedora-directory-commits at redhat.com  Wed Feb 14 00:46:31 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Tue, 13 Feb 2007 19:46:31 -0500
Subject: [Fedora-directory-commits] coolkey/src/coolkey Makefile.am, 1.5,
	1.6 Makefile.in, 1.8, 1.9 machdep.cpp, 1.3, 1.4 slot.cpp, 1.4, 1.5
Message-ID: <200702140046.l1E0kVPc019731@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19672/src/coolkey

Modified Files:
	Makefile.am Makefile.in machdep.cpp slot.cpp 
Log Message:


Make file clean up:
  don't distribute .a and .la files.
  fix build problem when --enable-pk11install is not set.
  Add dist values so make dist includes the correct files.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am	18 Jan 2007 01:00:25 -0000	1.5
+++ Makefile.am	14 Feb 2007 00:46:28 -0000	1.6
@@ -21,6 +21,7 @@
 
 SUBDIRS = 
 AM_CPP_FLAGS =
+EXTRA_DIST = coolkeypk11.def
 pkcs11dir = $(libdir)/pkcs11
 pkcs11_LTLIBRARIES = libcoolkeypk11.la
 
@@ -33,7 +34,6 @@
 	object.cpp \
 	PKCS11Exception.cpp \
 	slot.cpp    \
-	config.h \
 	locking.h \
 	log.h \
 	machdep.h \
@@ -65,6 +65,10 @@
 clean-generic:
 	rm -f coolkeypk11.sym
 
+# remove the static and libtool libraries if necessary
+install-data-hook:
+	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
+	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
 
 
 #MODULE = coolkeypk11


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in	18 Jan 2007 01:00:55 -0000	1.8
+++ Makefile.in	14 Feb 2007 00:46:28 -0000	1.9
@@ -234,6 +234,7 @@
 target_vendor = @target_vendor@
 SUBDIRS = 
 AM_CPP_FLAGS = 
+EXTRA_DIST = coolkeypk11.def
 pkcs11dir = $(libdir)/pkcs11
 pkcs11_LTLIBRARIES = libcoolkeypk11.la
 libcoolkeypk11_la_SOURCES = \
@@ -245,7 +246,6 @@
 	object.cpp \
 	PKCS11Exception.cpp \
 	slot.cpp    \
-	config.h \
 	locking.h \
 	log.h \
 	machdep.h \
@@ -655,6 +655,8 @@
 info-am:
 
 install-data-am: install-pkcs11LTLIBRARIES
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-exec-am:
 
@@ -692,14 +694,15 @@
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-recursive distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-pkcs11LTLIBRARIES \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-pkcs11LTLIBRARIES
+	install-data-am install-data-hook install-exec install-exec-am \
+	install-info install-info-am install-man \
+	install-pkcs11LTLIBRARIES install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	uninstall-pkcs11LTLIBRARIES
 
 
 #
@@ -713,6 +716,11 @@
 clean-generic:
 	rm -f coolkeypk11.sym
 
+# remove the static and libtool libraries if necessary
+install-data-hook:
+	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
+	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
+
 #MODULE = coolkeypk11
 #REQUIRES = ckyapplet zlib
 #USE_STATIC_RTL=1


Index: machdep.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/machdep.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- machdep.cpp	7 Sep 2006 20:57:20 -0000	1.3
+++ machdep.cpp	14 Feb 2007 00:46:28 -0000	1.4
@@ -247,7 +247,9 @@
 	// from getSHMemAddr.
 	return NULL;
     }
+    int mask = umask(0);
     int ret = mkdir (MEMSEGPATH, 0777);
+    umask(mask);
     if ((ret == -1) && (errno != EEXIST)) {
 	delete shmemData;
 	return NULL;


Index: slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- slot.cpp	30 Nov 2006 23:24:46 -0000	1.4
+++ slot.cpp	14 Feb 2007 00:46:28 -0000	1.5
@@ -625,14 +625,10 @@
 	    return;
 	}
 	state |= CAC_CARD | APPLET_SELECTABLE | APPLET_PERSONALIZED;
-	/* ARG CAC is evil. once you've selected an applet, you cannot
-	 * select the card manager unless you reset the card...
-	 * ... even removing and reinserting the card does not change the
-	 * applet selection,
-	 * do so reset the card now  so we can get the CUID 
-	 * NOTE: this will cause other apps to loose login state!
-	CKYCardConnection_Reset(conn);
-        readCUID(); /* get the CUID before we loose the ability to */
+	/* skip the read of the cuid. We really don't need it and,
+         * the only way to get it from the cac is to reset it.
+         * other apps may be running now, so resetting the cac is a bit
+         * unfriendly */
 	isVersion1Key = 0;
 	needLogin = 1;
 
@@ -692,6 +688,8 @@
 {
     if (isVersion1Key) {
 	if (hard) {
+	    reverify = false; /* no need to revalidate in the future,
+	                       * we're clearing the nonce now */
 	    nonceValid = false;
 	    CKYBuffer_Zero(&nonce);
 	    CKYBuffer_Resize(&nonce,8);



From fedora-directory-commits at redhat.com  Wed Feb 14 00:46:30 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Tue, 13 Feb 2007 19:46:30 -0500
Subject: [Fedora-directory-commits] coolkey configure.in, 1.10,
	1.11 configure, 1.8, 1.9 coolkey.spec, 1.6, 1.7
Message-ID: <200702140046.l1E0kU3i019721@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19672

Modified Files:
	configure.in configure coolkey.spec 
Log Message:


Make file clean up:
  don't distribute .a and .la files.
  fix build problem when --enable-pk11install is not set.
  Add dist values so make dist includes the correct files.



Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.in	9 Feb 2007 18:47:42 -0000	1.10
+++ configure.in	14 Feb 2007 00:46:28 -0000	1.11
@@ -103,21 +103,13 @@
 AC_SUBST(LIBCKYAPPLET)
 LIBCKYAPPLET="\${top_builddir}/src/libckyapplet/libckyapplet.la"
 
-AC_ARG_WITH(pcsclite,
-  [  --with-pcsclite         Use pcsc-lite (default=yes)])
-if test "$with_pcsclite" = "no" -o "$with_pcsclite" = "false"
-then
-  with_pcsclite=no
-else
-      PKG_CHECK_MODULES(PCSC, libpcsclite, [ with_pcsclite=yes ],
-        [ if test -f /usr/local/lib/pkgconfig/libpcsclite.pc ; then
-                AC_MSG_ERROR([use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure])
+PKG_CHECK_MODULES(PCSC, libpcsclite, true,
+        [ if $UNIX -eq 1 ; then
+                AC_MSG_ERROR([could not find pcsc-lite libraries])
           else
                 AC_MSG_WARN([pcsc-lite not found])
-                with_pcsclite=no
         fi
       ])
-fi
 
 # Add argument for pk11install
 AC_ARG_ENABLE(pk11install, 


Index: configure
===================================================================
RCS file: /cvs/dirsec/coolkey/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure	9 Feb 2007 18:47:42 -0000	1.8
+++ configure	14 Feb 2007 00:46:28 -0000	1.9
@@ -1068,7 +1068,6 @@
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
-  --with-pcsclite         Use pcsc-lite (default=yes)
 
 Some influential environment variables:
   CC          C compiler command
@@ -4288,7 +4287,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4291 "configure"' > conftest.$ac_ext
+  echo '#line 4290 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5423,7 +5422,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5426:" \
+echo "$as_me:5425:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6486,11 +6485,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6489: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6488: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6493: \$? = $ac_status" >&5
+   echo "$as_me:6492: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6754,11 +6753,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6757: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6756: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6761: \$? = $ac_status" >&5
+   echo "$as_me:6760: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6858,11 +6857,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6861: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6860: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6865: \$? = $ac_status" >&5
+   echo "$as_me:6864: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8327,7 +8326,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 8330 "configure"' > conftest.$ac_ext
+    echo '#line 8329 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9224,7 +9223,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9227 "configure"
+#line 9226 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9324,7 +9323,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9327 "configure"
+#line 9326 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11665,11 +11664,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11668: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11667: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11672: \$? = $ac_status" >&5
+   echo "$as_me:11671: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11769,11 +11768,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11772: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11771: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11776: \$? = $ac_status" >&5
+   echo "$as_me:11775: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12305,7 +12304,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 12308 "configure"' > conftest.$ac_ext
+    echo '#line 12307 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -13360,11 +13359,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13363: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13362: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13367: \$? = $ac_status" >&5
+   echo "$as_me:13366: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13464,11 +13463,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13467: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13466: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13471: \$? = $ac_status" >&5
+   echo "$as_me:13470: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14913,7 +14912,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 14916 "configure"' > conftest.$ac_ext
+    echo '#line 14915 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15688,11 +15687,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15691: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15690: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15695: \$? = $ac_status" >&5
+   echo "$as_me:15694: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15956,11 +15955,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15959: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15958: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15963: \$? = $ac_status" >&5
+   echo "$as_me:15962: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16060,11 +16059,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16063: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16062: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16067: \$? = $ac_status" >&5
+   echo "$as_me:16066: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17529,7 +17528,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17532 "configure"' > conftest.$ac_ext
+    echo '#line 17531 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -19004,16 +19003,6 @@
 LIBCKYAPPLET="\${top_builddir}/src/libckyapplet/libckyapplet.la"
 
 
-# Check whether --with-pcsclite or --without-pcsclite was given.
-if test "${with_pcsclite+set}" = set; then
-  withval="$with_pcsclite"
-
-fi;
-if test "$with_pcsclite" = "no" -o "$with_pcsclite" = "false"
-then
-  with_pcsclite=no
-else
-
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
@@ -19177,25 +19166,23 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$PCSC_PKG_ERRORS" >&5
 
-	 if test -f /usr/local/lib/pkgconfig/libpcsclite.pc ; then
-                { { echo "$as_me:$LINENO: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&5
-echo "$as_me: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&2;}
+	 if $UNIX -eq 1 ; then
+                { { echo "$as_me:$LINENO: error: could not find pcsc-lite libraries" >&5
+echo "$as_me: error: could not find pcsc-lite libraries" >&2;}
    { (exit 1); exit 1; }; }
           else
                 { echo "$as_me:$LINENO: WARNING: pcsc-lite not found" >&5
 echo "$as_me: WARNING: pcsc-lite not found" >&2;}
-                with_pcsclite=no
         fi
 
 elif test $pkg_failed = untried; then
-	 if test -f /usr/local/lib/pkgconfig/libpcsclite.pc ; then
-                { { echo "$as_me:$LINENO: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&5
-echo "$as_me: error: use PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure" >&2;}
+	 if $UNIX -eq 1 ; then
+                { { echo "$as_me:$LINENO: error: could not find pcsc-lite libraries" >&5
+echo "$as_me: error: could not find pcsc-lite libraries" >&2;}
    { (exit 1); exit 1; }; }
           else
                 { echo "$as_me:$LINENO: WARNING: pcsc-lite not found" >&5
 echo "$as_me: WARNING: pcsc-lite not found" >&2;}
-                with_pcsclite=no
         fi
 
 else
@@ -19203,8 +19190,7 @@
 	PCSC_LIBS=$pkg_cv_PCSC_LIBS
         echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	 with_pcsclite=yes
-fi
+	true
 fi
 
 # Add argument for pk11install


Index: coolkey.spec
===================================================================
RCS file: /cvs/dirsec/coolkey/coolkey.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- coolkey.spec	18 Aug 2006 16:04:42 -0000	1.6
+++ coolkey.spec	14 Feb 2007 00:46:28 -0000	1.7
@@ -18,8 +18,8 @@
 # END COPYRIGHT BLOCK
 
 Name: coolkey
-Version: 1.0.1
-Release: 2
+Version: 1.1.0
+Release: 1
 Summary: CoolKey PKCS #11 module
 License: LGPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -57,10 +57,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,6 +80,17 @@
 
 
 %changelog
+* Wed Feb 14 2007 Bob Relyea <rrelyea at redhat.com> - 1.1.0
+- Clear any logout rests after a successful login.
+- Don't grab the CUID on cac's. Reseting the card causes it to
+- logout of other applications.
+- Shared memory directory needs to be writeable by all so
+- coolkey can create caches for any user. (lack of caches
+- show up in screen savers reactly slowly).
+- fix login hw race failures
+- make the coolkey token caches persist over application calls.
+- make a separate cache for each user.
+
 * Sun Jul 16 2006 Florian La Roche <laroche at redhat.com> - 1.0.1-2
 - fix excludearch line
 



From fedora-directory-commits at redhat.com  Wed Feb 14 01:42:34 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Tue, 13 Feb 2007 20:42:34 -0500
Subject: [Fedora-directory-commits] coolkey configure.in,1.11,1.12
Message-ID: <200702140142.l1E1gYaO023602@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23586

Modified Files:
	configure.in 
Log Message:


Make sure windows still build when following the instructions from the wikki


Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure.in	14 Feb 2007 00:46:28 -0000	1.11
+++ configure.in	14 Feb 2007 01:42:32 -0000	1.12
@@ -54,8 +54,8 @@
 *-*-win*|*-*-cygwin*)
   	AC_MSG_RESULT([Windows])
 	WINDOWS=1
-	#ZLIB_CFLAGS=-Ic:/zlib
-	#ZLIB_LIBS=c:/zlib/zlib.dll
+	ZLIB_CFLAGS=-I${ZLIB_INCLUDE}
+	ZLIB_LIBS=${ZLIB_LIB}/zdll.dll
 	#OS_FLAGS=`echo $INCLUDE | tr '[[:upper:]]' '[[:lower:]]' | sed -e 's;\\\\;/;g' -e 's;.:;/cygdrive/&/;g' -e 's;:;;g' -e 's;//;/;g' -e 's/;/\" -I\"/g' -e 's;^;-I\";' -e 's;$;\";'`
 	CPPFLAGS="$CPPFLAGS $OS_FLAGS -DWIN32"
 	LDFLAGS="$LDFLAGS"



From fedora-directory-commits at redhat.com  Wed Feb 14 19:54:04 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Wed, 14 Feb 2007 14:54:04 -0500
Subject: [Fedora-directory-commits] coolkey/src/coolkey coolkey.cpp, 1.1,
	1.2 log.cpp, 1.1, 1.2 log.h, 1.3, 1.4 slot.cpp, 1.5, 1.6
Message-ID: <200702141954.l1EJs4cu015267@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15243

Modified Files:
	coolkey.cpp log.cpp log.h slot.cpp 
Log Message:


Add optional SYSLOG logging for Linux and Mac.
Allow CAC cards which have only one cert to operate.



Index: coolkey.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/coolkey.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coolkey.cpp	9 Jun 2006 18:39:11 -0000	1.1
+++ coolkey.cpp	14 Feb 2007 19:54:01 -0000	1.2
@@ -225,10 +225,15 @@
         }
     }
     char * logFileName = getenv("COOL_KEY_LOG_FILE");
-    if (logFileName)
-	log = new FileLog(logFileName);
-    else
+    if (logFileName) {
+	if (strcmp(logFileName,"SYSLOG") == 0) {
+	    log = new SysLog();
+	} else {
+	    log = new FileLog(logFileName);
+	}
+    } else {
 	log = new DummyLog();
+    }
     log->log("Initialize called, hello %d\n", 5);
     CKY_SetName("coolkey");
     slotList = new SlotList(log);


Index: log.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/log.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log.cpp	9 Jun 2006 18:39:11 -0000	1.1
+++ log.cpp	14 Feb 2007 19:54:01 -0000	1.2
@@ -24,6 +24,9 @@
 #include "log.h"
 #include <cstdarg>
 #include "PKCS11Exception.h"
+#ifndef _WIN32
+#include "syslog.h"
+#endif
 
 
 FileLog::FileLog(const char *filename )
@@ -81,3 +84,30 @@
 {
     fclose(file);
 }
+
+
+void
+SysLog::log(const char *msg, ...)
+{
+#ifndef _WIN32
+
+#define COOLKEY_PREFIX "libcoolkey:"
+    va_list ap;
+    char *msg2;
+
+    va_start(ap, msg);
+   
+    msg2 = (char *)malloc(strlen(msg)+sizeof(COOLKEY_PREFIX));
+    if (msg2) {
+	strcpy(msg2, COOLKEY_PREFIX);
+	strcat(msg2, msg); 
+
+	vsyslog(LOG_WARNING,  msg2, ap);
+	free(msg2);
+   } else {
+	vsyslog(LOG_WARNING,  msg, ap);
+   }
+
+    va_end(ap);
+#endif
+}


Index: log.h
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/log.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- log.h	30 Nov 2006 22:35:22 -0000	1.3
+++ log.h	14 Feb 2007 19:54:01 -0000	1.4
@@ -58,9 +58,9 @@
    SysLog(SysLog &) {}
    SysLog & operator=(SysLog &) { return *this; }
   public:
-    SysLog() { }
+    SysLog() {}
     void log(const char *msg, ...);
-    virtual ~SysLog() { }
+    virtual ~SysLog() {}
 };
 
 #endif


Index: slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- slot.cpp	14 Feb 2007 00:46:28 -0000	1.5
+++ slot.cpp	14 Feb 2007 19:54:01 -0000	1.6
@@ -2082,7 +2082,7 @@
 		     * is now valid */
 		    shmem.setValid();
 		}
-	   
+		return;
 	    }
 	}
 



From fedora-directory-commits at redhat.com  Fri Feb 16 19:46:09 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 14:46:09 -0500
Subject: [Fedora-directory-commits] coolkey/src/coolkey Makefile.am,1.6,1.7
Message-ID: <200702161946.l1GJk9tb004491@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/src/coolkey

Modified Files:
	Makefile.am 
Log Message:

make install fixes for windows



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am	14 Feb 2007 00:46:28 -0000	1.6
+++ Makefile.am	16 Feb 2007 19:46:02 -0000	1.7
@@ -22,7 +22,11 @@
 SUBDIRS = 
 AM_CPP_FLAGS =
 EXTRA_DIST = coolkeypk11.def
+if IS_WINDOWS
+pkcs11dir = $(libdir)
+else
 pkcs11dir = $(libdir)/pkcs11
+endif
 pkcs11_LTLIBRARIES = libcoolkeypk11.la
 
 libcoolkeypk11_la_SOURCES = \
@@ -69,20 +73,10 @@
 install-data-hook:
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
+if IS_WINDOWS
+	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.lib
+	mv $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.dll $(DESTDIR)$(pkcs11dir)/coolkeypk11.dll
+	cp $(ZLIB_LIB)/zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll
+endif
 
 
-#MODULE = coolkeypk11
-#REQUIRES = ckyapplet zlib
-#USE_STATIC_RTL=1
-
-#BASE_LIBRARY_NAME = coolkeypk11
-#LIBRARY_NAME = $(BASE_LIBRARY_NAME)
-#MAPFILE = $(OBJDIR)/coolkeypk11.def
-
-#DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" \
-# -DPKCS11_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
-
-#DEFINES += -DNSS_HIDE_NONSTANDARD_OBJECTS=1
-
-#pcdir = $(libdir)/pkgconfig
-#pc_DATA = libcoolkey.pc



From fedora-directory-commits at redhat.com  Fri Feb 16 19:46:10 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 14:46:10 -0500
Subject: [Fedora-directory-commits] 
	coolkey/src/libckyapplet Makefile.am, 1.5, 1.6
Message-ID: <200702161946.l1GJkA8Q004497@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/src/libckyapplet

Modified Files:
	Makefile.am 
Log Message:

make install fixes for windows



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am	14 Feb 2007 00:46:29 -0000	1.5
+++ Makefile.am	16 Feb 2007 19:46:07 -0000	1.6
@@ -60,6 +60,11 @@
 install-data-hook:
 	rm -f $(DESTDIR)$(libdir)/libckyapplet.a
 	rm -f $(DESTDIR)$(libdir)/libckyapplet.la
+if IS_WINDOWS
+	rm -f $(DESTDIR)$(libdir)/libckyapplet.lib
+endif
 
+if !IS_WINDOWS
 pcdir = $(libdir)/pkgconfig
 pc_DATA = libckyapplet.pc
+endif



From fedora-directory-commits at redhat.com  Fri Feb 16 19:46:04 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 14:46:04 -0500
Subject: [Fedora-directory-commits] coolkey configure.in, 1.12,
	1.13 ltmain.sh, 1.2, 1.3
Message-ID: <200702161946.l1GJkYh1004501@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442

Modified Files:
	configure.in ltmain.sh 
Log Message:

make install fixes for windows



Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.in	14 Feb 2007 01:42:32 -0000	1.12
+++ configure.in	16 Feb 2007 19:46:02 -0000	1.13
@@ -65,6 +65,11 @@
 	CC=cl
 	CXX=cl 
 	CXXFLAGS="$CXXFLAGS /EHsc"
+	#
+	# Sigh, prevents us from overriding it with --libdir= in the config 
+	* line, but we can still override it in the make line.
+	#
+	libdir=`cygpath ${WINDIR}/system32`
 	;;
 *-*-darwin*)
   	AC_MSG_RESULT([MAC])


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/coolkey/ltmain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ltmain.sh	25 Aug 2006 00:31:39 -0000	1.2
+++ ltmain.sh	16 Feb 2007 19:46:02 -0000	1.3
@@ -5367,7 +5367,7 @@
 	test "X$dir" = "X$file/" && dir=
 	dir="$dir$objdir"
 
-	if test -n "$relink_command"; then
+	if test -n "$relink_command" -a "$version_type" != "windows" ; then
 	  # Determine the prefix the user has applied to our future dir.
 	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
 
@@ -5406,7 +5406,7 @@
 	  shift
 
 	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
+	  test -n "$relink_command" -a "$version_type" != "windows" && srcname="$realname"T
 
 	  # Install the shared library and build the symlinks.
 	  $show "$install_prog $dir/$srcname $destdir/$realname"



From fedora-directory-commits at redhat.com  Fri Feb 16 19:50:58 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 14:50:58 -0500
Subject: [Fedora-directory-commits] coolkey/src/install Makefile.in,1.3,1.4
Message-ID: <200702161950.l1GJowQM004681@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/install
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4620/src/install

Modified Files:
	Makefile.in 
Log Message:


Update Makefiles generated by automake to support windows install



Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/install/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in	18 Jan 2007 01:03:54 -0000	1.3
+++ Makefile.in	16 Feb 2007 19:50:51 -0000	1.4
@@ -129,6 +129,8 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS_WINDOWS_FALSE = @IS_WINDOWS_FALSE@
+IS_WINDOWS_TRUE = @IS_WINDOWS_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBCKYAPPLET = @LIBCKYAPPLET@
 LIBOBJS = @LIBOBJS@



From fedora-directory-commits at redhat.com  Fri Feb 16 19:50:58 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 14:50:58 -0500
Subject: [Fedora-directory-commits] coolkey/src/libckyapplet Makefile.in,
	1.10, 1.11
Message-ID: <200702161951.l1GJowA7004687@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4620/src/libckyapplet

Modified Files:
	Makefile.in 
Log Message:


Update Makefiles generated by automake to support windows install



Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in	14 Feb 2007 00:46:29 -0000	1.10
+++ Makefile.in	16 Feb 2007 19:50:56 -0000	1.11
@@ -151,6 +151,8 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS_WINDOWS_FALSE = @IS_WINDOWS_FALSE@
+IS_WINDOWS_TRUE = @IS_WINDOWS_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBCKYAPPLET = @LIBCKYAPPLET@
 LIBOBJS = @LIBOBJS@
@@ -264,8 +266,8 @@
 	cky_basei.h \
 	dynlink.h 
 
-pcdir = $(libdir)/pkgconfig
-pc_DATA = libckyapplet.pc
+ at IS_WINDOWS_FALSE@pcdir = $(libdir)/pkgconfig
+ at IS_WINDOWS_FALSE@pc_DATA = libckyapplet.pc
 all: all-recursive
 
 .SUFFIXES:
@@ -729,6 +731,7 @@
 install-data-hook:
 	rm -f $(DESTDIR)$(libdir)/libckyapplet.a
 	rm -f $(DESTDIR)$(libdir)/libckyapplet.la
+ at IS_WINDOWS_TRUE@	rm -f $(DESTDIR)$(libdir)/libckyapplet.lib
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:



From fedora-directory-commits at redhat.com  Fri Feb 16 19:50:53 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 14:50:53 -0500
Subject: [Fedora-directory-commits] coolkey Makefile.in, 1.6,
	1.7 configure.in, 1.13, 1.14
Message-ID: <200702161951.l1GJpNDH004696@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4620

Modified Files:
	Makefile.in configure.in 
Log Message:


Update Makefiles generated by automake to support windows install



Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in	30 Nov 2006 22:35:22 -0000	1.6
+++ Makefile.in	16 Feb 2007 19:50:50 -0000	1.7
@@ -132,6 +132,8 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS_WINDOWS_FALSE = @IS_WINDOWS_FALSE@
+IS_WINDOWS_TRUE = @IS_WINDOWS_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBCKYAPPLET = @LIBCKYAPPLET@
 LIBOBJS = @LIBOBJS@


Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure.in	16 Feb 2007 19:46:02 -0000	1.13
+++ configure.in	16 Feb 2007 19:50:50 -0000	1.14
@@ -138,6 +138,7 @@
 AC_SUBST(SCARD_LIB_NAME)
 AM_CONDITIONAL(HAVE_PCSC, test x$with_pcsclite = xyes)
 AM_CONDITIONAL(BUILD_PK11INSTALL, test x$enable_pk11install = xyes)
+AM_CONDITIONAL(IS_WINDOWS, test $WINDOWS -eq 1)
 
 AC_DEFINE(DEBUG, 1, [Define to 1 if you want to include debugging code.])
 # Checks for header files.



From fedora-directory-commits at redhat.com  Fri Feb 16 19:50:53 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 14:50:53 -0500
Subject: [Fedora-directory-commits] coolkey/src/coolkey Makefile.in, 1.9,
	1.10
Message-ID: <200702161951.l1GJpN2r004699@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4620/src/coolkey

Modified Files:
	Makefile.in 
Log Message:


Update Makefiles generated by automake to support windows install



Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in	14 Feb 2007 00:46:28 -0000	1.9
+++ Makefile.in	16 Feb 2007 19:50:51 -0000	1.10
@@ -152,6 +152,8 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS_WINDOWS_FALSE = @IS_WINDOWS_FALSE@
+IS_WINDOWS_TRUE = @IS_WINDOWS_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBCKYAPPLET = @LIBCKYAPPLET@
 LIBOBJS = @LIBOBJS@
@@ -235,7 +237,8 @@
 SUBDIRS = 
 AM_CPP_FLAGS = 
 EXTRA_DIST = coolkeypk11.def
-pkcs11dir = $(libdir)/pkcs11
+ at IS_WINDOWS_FALSE@pkcs11dir = $(libdir)/pkcs11
+ at IS_WINDOWS_TRUE@pkcs11dir = $(libdir)
 pkcs11_LTLIBRARIES = libcoolkeypk11.la
 libcoolkeypk11_la_SOURCES = \
 	coolkey.cpp \
@@ -720,22 +723,9 @@
 install-data-hook:
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
-
-#MODULE = coolkeypk11
-#REQUIRES = ckyapplet zlib
-#USE_STATIC_RTL=1
-
-#BASE_LIBRARY_NAME = coolkeypk11
-#LIBRARY_NAME = $(BASE_LIBRARY_NAME)
-#MAPFILE = $(OBJDIR)/coolkeypk11.def
-
-#DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" \
-# -DPKCS11_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
-
-#DEFINES += -DNSS_HIDE_NONSTANDARD_OBJECTS=1
-
-#pcdir = $(libdir)/pkgconfig
-#pc_DATA = libcoolkey.pc
+ at IS_WINDOWS_TRUE@	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.lib
+ at IS_WINDOWS_TRUE@	mv $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.dll $(DESTDIR)$(pkcs11dir)/coolkeypk11.dll
+ at IS_WINDOWS_TRUE@	cp $(ZLIB_LIB)/zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:



From fedora-directory-commits at redhat.com  Fri Feb 16 21:16:13 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 16:16:13 -0500
Subject: [Fedora-directory-commits] coolkey/src/coolkey slot.cpp,1.6,1.7
Message-ID: <200702162116.l1GLGDJC012518@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12462/src/coolkey

Modified Files:
	slot.cpp 
Log Message:

1) Check in configure (linux/unix) after build changes.
2) Fix a bug were tokens without any applet appear to have a firmware version.



Index: slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slot.cpp	14 Feb 2007 19:54:01 -0000	1.6
+++ slot.cpp	16 Feb 2007 21:16:11 -0000	1.7
@@ -534,6 +534,8 @@
     OSTime time = OSTimeNow();
 
     mCoolkey = 0;
+    tokenFWVersion.major = 0;
+    tokenFWVersion.minor = 0;
 
     // try to connect to the card
     if( ! CKYCardConnection_IsConnected(conn) ) {



From fedora-directory-commits at redhat.com  Fri Feb 16 21:16:13 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 16:16:13 -0500
Subject: [Fedora-directory-commits] coolkey configure,1.9,1.10
Message-ID: <200702162116.l1GLGDFX012519@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12462

Modified Files:
	configure 
Log Message:

1) Check in configure (linux/unix) after build changes.
2) Fix a bug were tokens without any applet appear to have a firmware version.



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.9 -r 1.10 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/coolkey/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure	14 Feb 2007 00:46:28 -0000	1.9
+++ configure	16 Feb 2007 21:16:10 -0000	1.10
@@ -1,25 +1,54 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for coolkey "1.1.0".
+# Generated by GNU Autoconf 2.61 for coolkey "1.1.0".
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -29,8 +58,43 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -44,18 +108,19 @@
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -63,157 +128,388 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
 fi
 
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
[...12360 lines suppressed...]
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
 
 
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
   # Check whether this is an Automake generated Makefile or not.
@@ -22243,18 +22818,29 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # So let's grep whole file.
   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
+    dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   else
     continue
   fi
@@ -22276,53 +22862,79 @@
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
+    fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
     done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
   done
 done
  ;;
+
   esac
-done
-_ACEOF
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF



From fedora-directory-commits at redhat.com  Fri Feb 16 21:19:38 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 16:19:38 -0500
Subject: [Fedora-directory-commits] 
	coolkey config.h, 1.3, NONE config.status,
	1.7, NONE libtool, 1.3, NONE
Message-ID: <200702162119.l1GLJcRW012582@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12548

Removed Files:
	config.h config.status libtool 
Log Message:


For simplicity and convinience we include a number of files which are built
with the autotools (Makefile.in, configure, m4 macros, etc). We aren't
including files built by configure, however. These files are built by 
configure and should be in CVS ore the distribution.



--- config.h DELETED ---


--- config.status DELETED ---


--- libtool DELETED ---



From fedora-directory-commits at redhat.com  Fri Feb 16 21:47:57 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 16:47:57 -0500
Subject: [Fedora-directory-commits] coolkey README,1.2,1.3
Message-ID: <200702162147.l1GLlvLo012961@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12912

Modified Files:
	README 
Log Message:


Include install instructions for windows.



Index: README
===================================================================
RCS file: /cvs/dirsec/coolkey/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README	8 Feb 2007 19:25:12 -0000	1.2
+++ README	16 Feb 2007 21:47:55 -0000	1.3
@@ -160,6 +160,7 @@
             (e.g. c:/zlib/include)
          3. Set ZLIB_LIB to the location of the export libraries 
             (e.g. c:/zlib/lib) 
+	 4. Make sure both zdll.lib and zlib1.dll are in the ZLIB_LIB directory
 
 Building
 
@@ -177,9 +178,13 @@
 
 Installing
 
-Make install does not work on windows. You'll need to fetch 
-src/libckyapplet/.lib/libckyapplet-1.dll, 
-src/coolkeypk11/.lib/libcookeypk11.dll and zlib1.dll from your zlibdirectory 
-and install it in your windows system32 directory. 
+To build a distribution:
+
+make install DESTDIR=C:/build/staging-area libdir=/libraries prefix=/sdk
+
+To install on your local machine:
+
+make install
+
 
 



From fedora-directory-commits at redhat.com  Fri Feb 16 23:05:03 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 18:05:03 -0500
Subject: [Fedora-directory-commits] coolkey/src/libckyapplet Makefile.in,
	1.11, 1.12
Message-ID: <200702162305.l1GN53kc021074@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21012/src/libckyapplet

Modified Files:
	Makefile.in 
Log Message:


update Makefiles so Makedist works correctly



Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in	16 Feb 2007 19:50:56 -0000	1.11
+++ Makefile.in	16 Feb 2007 23:04:56 -0000	1.12
@@ -145,6 +145,7 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 HAVE_PCSC_FALSE = @HAVE_PCSC_FALSE@
 HAVE_PCSC_TRUE = @HAVE_PCSC_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -185,13 +186,9 @@
 VERSION = @VERSION@
 ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -208,23 +205,30 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@



From fedora-directory-commits at redhat.com  Fri Feb 16 23:04:53 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 18:04:53 -0500
Subject: [Fedora-directory-commits] 
	coolkey Makefile.am, 1.4, 1.5 Makefile.in, 1.7, 1.8
Message-ID: <200702162305.l1GN5NLD021081@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21012

Modified Files:
	Makefile.am Makefile.in 
Log Message:


update Makefiles so Makedist works correctly



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	30 Nov 2006 22:35:22 -0000	1.4
+++ Makefile.am	16 Feb 2007 23:04:50 -0000	1.5
@@ -27,7 +27,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST =
+EXTRA_DIST = cookey.spec LICENSE
 
 DISTCLEANFILES = 
 


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in	16 Feb 2007 19:50:50 -0000	1.7
+++ Makefile.in	16 Feb 2007 23:04:50 -0000	1.8
@@ -126,6 +126,7 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 HAVE_PCSC_FALSE = @HAVE_PCSC_FALSE@
 HAVE_PCSC_TRUE = @HAVE_PCSC_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -166,13 +167,9 @@
 VERSION = @VERSION@
 ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -189,23 +186,30 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -216,7 +220,7 @@
 target_vendor = @target_vendor@
 SUBDIRS = src/libckyapplet src/coolkey $(am__append_1)
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = 
+EXTRA_DIST = cookey.spec LICENSE
 DISTCLEANFILES = 
 AUTOMAKE_OPTIONS = foreign
 all: config.h



From fedora-directory-commits at redhat.com  Fri Feb 16 23:04:58 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 18:04:58 -0500
Subject: [Fedora-directory-commits] coolkey/src/coolkey Makefile.am, 1.7,
	1.8 Makefile.in, 1.10, 1.11 test.cpp, 1.1, NONE
Message-ID: <200702162305.l1GN5SRi021085@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21012/src/coolkey

Modified Files:
	Makefile.am Makefile.in 
Removed Files:
	test.cpp 
Log Message:


update Makefiles so Makedist works correctly



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am	16 Feb 2007 19:46:02 -0000	1.7
+++ Makefile.am	16 Feb 2007 23:04:51 -0000	1.8
@@ -21,7 +21,7 @@
 
 SUBDIRS = 
 AM_CPP_FLAGS =
-EXTRA_DIST = coolkeypk11.def
+EXTRA_DIST = coolkeypk11.def coolkeypk11.rc
 if IS_WINDOWS
 pkcs11dir = $(libdir)
 else


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in	16 Feb 2007 19:50:51 -0000	1.10
+++ Makefile.in	16 Feb 2007 23:04:51 -0000	1.11
@@ -146,6 +146,7 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 HAVE_PCSC_FALSE = @HAVE_PCSC_FALSE@
 HAVE_PCSC_TRUE = @HAVE_PCSC_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -186,13 +187,9 @@
 VERSION = @VERSION@
 ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -209,23 +206,30 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -236,7 +240,7 @@
 target_vendor = @target_vendor@
 SUBDIRS = 
 AM_CPP_FLAGS = 
-EXTRA_DIST = coolkeypk11.def
+EXTRA_DIST = coolkeypk11.def coolkeypk11.rc
 @IS_WINDOWS_FALSE at pkcs11dir = $(libdir)/pkcs11
 @IS_WINDOWS_TRUE at pkcs11dir = $(libdir)
 pkcs11_LTLIBRARIES = libcoolkeypk11.la


--- test.cpp DELETED ---



From fedora-directory-commits at redhat.com  Fri Feb 16 23:04:58 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 18:04:58 -0500
Subject: [Fedora-directory-commits] coolkey/src/install Makefile.in,1.4,1.5
Message-ID: <200702162305.l1GN5SQe021088@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/install
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21012/src/install

Modified Files:
	Makefile.in 
Log Message:


update Makefiles so Makedist works correctly



Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/install/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in	16 Feb 2007 19:50:51 -0000	1.4
+++ Makefile.in	16 Feb 2007 23:04:56 -0000	1.5
@@ -123,6 +123,7 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 HAVE_PCSC_FALSE = @HAVE_PCSC_FALSE@
 HAVE_PCSC_TRUE = @HAVE_PCSC_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -163,13 +164,9 @@
 VERSION = @VERSION@
 ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -186,23 +183,30 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@



From fedora-directory-commits at redhat.com  Fri Feb 16 23:25:08 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 16 Feb 2007 18:25:08 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.25,
	1.26 Makefile.in, 1.29, 1.30 aclocal.m4, 1.19, 1.20 compile,
	1.14, 1.15 config.guess, 1.13, 1.14 config.h.in, 1.2,
	1.3 config.sub, 1.13, 1.14 configure, 1.28, 1.29 configure.ac,
	1.19, 1.20 depcomp, 1.14, 1.15 install-sh, 1.14,
	1.15 ltmain.sh, 1.9, 1.10 missing, 1.14, 1.15
Message-ID: <200702162325.l1GNP8Gf021402@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21367

Modified Files:
	Makefile.am Makefile.in aclocal.m4 compile config.guess 
	config.h.in config.sub configure configure.ac depcomp 
	install-sh ltmain.sh missing 
Log Message:
Resolves: 229095
Summary: Fixed build flags for compiling with pthread on HP-UX.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.am	12 Feb 2007 19:39:03 -0000	1.25
+++ Makefile.am	16 Feb 2007 23:25:06 -0000	1.26
@@ -25,6 +25,10 @@
 
 AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
 PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+# We need to make sure that libpthread is linked before libc on HP-UX.
+if HPUX
+AM_LDFLAGS = -lpthread
+endif
 
 #------------------------
 # Linker Flags


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.29 -r 1.30 Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.in	13 Feb 2007 19:00:11 -0000	1.29
+++ Makefile.in	16 Feb 2007 23:25:06 -0000	1.30
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,8 @@
 
 
 
+SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES!
 ) $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -685,19 +687,19 @@
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \
 	$(libacl_plugin_la_SOURCES) \
@@ -799,6 +801,8 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HPUX_FALSE = @HPUX_FALSE@
+HPUX_TRUE = @HPUX_TRUE@
 ICU_CONFIG = @ICU_CONFIG@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -828,7 +832,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -950,6 +953,8 @@
 
 AM_CPPFLAGS = $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES)
 PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
+# We need to make sure that libpthread is linked before libc on HP-UX.
+ at HPUX_TRUE@AM_LDFLAGS = -lpthread
 
 #------------------------
 # Linker Flags
@@ -5095,2286 +5100,2286 @@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi`
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo: ldap/servers/plugins/acl/acl_ext.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl_ext.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo: ldap/servers/plugins/acl/aclanom.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclanom.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo: ldap/servers/plugins/acl/acleffectiverights.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acleffectiverights.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo: ldap/servers/plugins/acl/aclgroup.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclgroup.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo: ldap/servers/plugins/acl/aclinit.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclinit.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo: ldap/servers/plugins/acl/acllas.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acllas.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo: ldap/servers/plugins/acl/acllist.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acllist.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo: ldap/servers/plugins/acl/aclparse.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclparse.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo: ldap/servers/plugins/acl/aclplugin.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclplugin.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo: ldap/servers/plugins/acl/aclproxy.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclproxy.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo: ldap/servers/plugins/acl/aclutil.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclutil.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c
 
 ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo: ldap/servers/plugins/uiduniq/7bit.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/uiduniq/7bit.c' object='ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c
 
 ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo: ldap/servers/plugins/uiduniq/uid.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c; \
[...2982 lines suppressed...]
 lib/libaccess/libns_dshttpd_la-nseframe.lo: lib/libaccess/nseframe.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nseframe.cpp' object='lib/libaccess/libns_dshttpd_la-nseframe.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
 
 lib/libaccess/libns_dshttpd_la-nsautherr.lo: lib/libaccess/nsautherr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nsautherr.cpp' object='lib/libaccess/libns_dshttpd_la-nsautherr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
 
 lib/libaccess/libns_dshttpd_la-oneeval.lo: lib/libaccess/oneeval.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/oneeval.cpp' object='lib/libaccess/libns_dshttpd_la-oneeval.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
 
 lib/libaccess/libns_dshttpd_la-register.lo: lib/libaccess/register.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/register.cpp' object='lib/libaccess/libns_dshttpd_la-register.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
 
 lib/libaccess/libns_dshttpd_la-symbols.lo: lib/libaccess/symbols.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/symbols.cpp' object='lib/libaccess/libns_dshttpd_la-symbols.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
 
 lib/libaccess/libns_dshttpd_la-usi.lo: lib/libaccess/usi.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usi.cpp' object='lib/libaccess/libns_dshttpd_la-usi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
 
 lib/libaccess/libns_dshttpd_la-usrcache.lo: lib/libaccess/usrcache.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usrcache.cpp' object='lib/libaccess/libns_dshttpd_la-usrcache.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
 
 lib/base/libns_dshttpd_la-crit.lo: lib/base/crit.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/crit.cpp' object='lib/base/libns_dshttpd_la-crit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
 
 lib/base/libns_dshttpd_la-dns.lo: lib/base/dns.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dns.cpp' object='lib/base/libns_dshttpd_la-dns.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
 
 lib/base/libns_dshttpd_la-dnsdmain.lo: lib/base/dnsdmain.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dnsdmain.cpp' object='lib/base/libns_dshttpd_la-dnsdmain.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
 
 lib/base/libns_dshttpd_la-ereport.lo: lib/base/ereport.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/ereport.cpp' object='lib/base/libns_dshttpd_la-ereport.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
 
 lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
 
 lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
 
 lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
 
 lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
 
 lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
 
 lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
 
 lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
 
 lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
 
 lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
 
 lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
 
 lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.19 -r 1.20 aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- aclocal.m4	13 Feb 2007 19:00:11 -0000	1.19
+++ aclocal.m4	16 Feb 2007 23:25:06 -0000	1.20
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 47 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +123,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
+Xsed='sed -e s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +143,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a `.a' archive for static linking (except M$VC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,7 +163,6 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -183,17 +182,15 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
-_LT_CC_BASENAME([$compiler])
-
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -234,56 +231,11 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_LINKER_BOILERPLATE
-
-
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -356,15 +308,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -533,7 +485,7 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -584,22 +536,6 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -631,7 +567,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -641,10 +577,8 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+     # So say no if there are warnings
[...3358 lines suppressed...]
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -7032,16 +6694,27 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
+
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -7095,15 +6768,26 @@
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                     -*- Autoconf -*-
+# Helper functions for option handling.                    -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 
-# serial 3
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -7128,16 +6812,28 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
 #
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Check to make sure that the build environment is sane.
+#
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# 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, 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.
 
-# serial 4
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
 
 # AM_SANITY_CHECK
 # ---------------
@@ -7180,14 +6876,25 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # AM_PROG_INSTALL_STRIP
-# ---------------------
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -7210,13 +6917,25 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2004  Free Software Foundation, Inc.
+
+# 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, 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
 
-# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------


Index: compile
===================================================================
RCS file: /cvs/dirsec/ldapserver/compile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- compile	13 Feb 2007 19:00:11 -0000	1.14
+++ compile	16 Feb 2007 23:25:06 -0000	1.15
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2005-05-14.22
+scriptversion=2004-09-10.20
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,11 +47,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit $?
+    exit 0
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit $?
+    exit 0
     ;;
 esac
 
@@ -125,8 +125,6 @@
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"


Index: config.guess
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.guess,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config.guess	13 Feb 2007 19:00:11 -0000	1.13
+++ config.guess	16 Feb 2007 23:25:06 -0000	1.14
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2004-09-07'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,15 +17,13 @@
 #
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Originally written by Per Bothner <per at bothner.com>.
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -55,7 +53,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -68,11 +66,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -125,7 +123,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi at noc.rutgers.edu 1994-08-24)
@@ -198,20 +196,55 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit ;;
+	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -264,43 +297,37 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit ;;
+	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit ;;
+	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit ;;
+	exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
+	exit 0 ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
+	exit 0 ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit ;;
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	exit 0;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -308,32 +335,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit ;;
+	exit 0 ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -342,10 +369,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
+	exit 0 ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -357,10 +384,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit ;;
+	exit 0 ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -371,40 +398,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit ;;
+	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -428,33 +455,32 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit ;;
+	exit 0 ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit ;;
+	exit 0 ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit ;;
+	exit 0 ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit ;;
+	exit 0 ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -470,29 +496,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+ 	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit ;;
+	exit 0 ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit ;;
+	exit 0 ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit ;;
+	exit 0 ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	exit 0 ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit ;;
+	exit 0 ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -500,7 +526,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -515,18 +541,14 @@
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	exit 0 ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -540,28 +562,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit ;;
+	exit 0 ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit ;;
+	exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit ;;
+	exit 0 ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit ;;
+	exit 0 ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit ;;
+	exit 0 ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit ;;
+	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -623,19 +645,9 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -643,11 +655,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -675,166 +687,158 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
-	exit ;;
+	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit ;;
+	exit 0 ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit ;;
+	exit 0 ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit ;;
+	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit ;;
+	exit 0 ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit ;;
+	exit 0 ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit ;;
+	exit 0 ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit ;;
+	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+        exit 0 ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
+	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
+	exit 0 ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	exit 0 ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
+	exit 0 ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
+	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
+	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit ;;
+	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
+	exit 0 ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
+	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit ;;
+	exit 0 ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit ;;
+	exit 0 ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -852,7 +856,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -871,14 +875,14 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -892,7 +896,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
+	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -900,25 +904,25 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit ;;
+	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
+	exit 0 ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -936,15 +940,15 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
+		exit 0 ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
+		exit 0 ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
+		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -972,18 +976,15 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit ;;
+	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -991,27 +992,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
+	exit 0 ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
+	exit 0 ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
+	exit 0 ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
+	exit 0 ;;
+	i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
+	exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1019,16 +1020,15 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	exit 0 ;;
+    i*86:*:5:[78]*)
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
+	exit 0 ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1046,73 +1046,73 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit ;;
+	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit ;;
+        exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit ;;
+	exit 0 ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit ;;
+	exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit ;;
+	exit 0 ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit ;;
+	exit 0 ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit ;;
+	exit 0 ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit ;;
+	exit 0 ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit ;;
+	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1120,65 +1120,61 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit ;;
+	exit 0 ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel at ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit ;;
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit ;;
+	exit 0 ;;
     *:*:*:FTX*)
 	# From seanf at swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green at stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	exit 0 ;;
     *:VOS:*:*)
 	# From Paul.Green at stratus.com.
 	echo hppa1.1-stratus-vos
-	exit ;;
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit ;;
+	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit ;;
+	exit 0 ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit ;;
+	exit 0 ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit ;;
+	exit 0 ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1186,7 +1182,7 @@
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1194,25 +1190,22 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit ;;
+	exit 0 ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit ;;
+	exit 0 ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1223,44 +1216,38 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
+	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit ;;
+	exit 0 ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit ;;
+	exit 0 ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit ;;
+	exit 0 ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit ;;
+	exit 0 ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit ;;
+	exit 0 ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit ;;
+	exit 0 ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
+	exit 0 ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
+	esac
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1292,7 +1279,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1381,12 +1368,11 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1395,22 +1381,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit ;;
+	exit 0 ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     c34*)
 	echo c34-convex-bsd
-	exit ;;
+	exit 0 ;;
     c38*)
 	echo c38-convex-bsd
-	exit ;;
+	exit 0 ;;
     c4*)
 	echo c4-convex-bsd
-	exit ;;
+	exit 0 ;;
     esac
 fi
 
@@ -1421,9 +1407,7 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+    ftp://ftp.gnu.org/pub/gnu/config/
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be


Index: config.h.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.h.in	15 Nov 2006 02:07:27 -0000	1.2
+++ config.h.in	16 Feb 2007 23:25:06 -0000	1.3
@@ -317,6 +317,12 @@
 /* UNIX */
 #undef XP_UNIX
 
+/* Source namespace */
+#undef _HPUX_SOURCE
+
+/* POSIX revision */
+#undef _POSIX_C_SOURCE
+
 /* _REENTRANT */
 #undef _REENTRANT
 


Index: config.sub
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.sub,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config.sub	13 Feb 2007 19:00:11 -0000	1.13
+++ config.sub	16 Feb 2007 23:25:06 -0000	1.14
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2004-08-29'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,15 +21,14 @@
 #
 # 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.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -71,7 +70,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -84,11 +83,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -100,7 +99,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
        break ;;
@@ -232,14 +231,13 @@
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -248,7 +246,6 @@
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -257,28 +254,23 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| or32 \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -306,7 +298,7 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bfin-* | bs2000-* \
+	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -318,7 +310,7 @@
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -327,7 +319,6 @@
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -336,7 +327,6 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -344,23 +334,20 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -502,10 +489,6 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -771,8 +754,9 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	openrisc | openrisc-*)
+	or32 | or32-*)
 		basic_machine=or32-unknown
+		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1045,10 +1029,6 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1098,9 +1078,12 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1187,8 +1170,7 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1206,7 +1188,7 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1315,9 +1297,6 @@
 	-kaos*)
 		os=-kaos
 		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
 	-none)
 		;;
 	*)
@@ -1395,9 +1374,6 @@
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1569,7 +1545,7 @@
 esac
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.28 -r 1.29 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- configure	13 Feb 2007 19:00:11 -0000	1.28
+++ configure	16 Feb 2007 23:25:06 -0000	1.29
@@ -280,15 +280,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL initdir SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
 XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3821,13 +3821,12 @@
     done
   done
 done
-IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
+  test ! -f $lt_ac_sed && break
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -3852,11 +3851,10 @@
     fi
   done
 done
+SED=$lt_cv_path_SED
 
 fi
 
-SED=$lt_cv_path_SED
-
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -3933,7 +3931,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
+      # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -3967,7 +3965,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -3997,15 +3995,6 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -4016,43 +4005,36 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+      # Check to see if the nm accepts a BSD-compat flag.
+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      # Tru64's nm complains that /dev/null is an invalid object file
+      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+      */dev/null* | *'Invalid file or object type'*)
+	lt_cv_path_NM="$tmp_nm -B"
+	break
+        ;;
+      *)
+	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	*/dev/null*)
+	  lt_cv_path_NM="$tmp_nm -p"
 	  break
 	  ;;
 	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
+	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	  continue # so that we can try to find one that supports BSD flags
 	  ;;
 	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
+      esac
+    fi
   done
+  IFS="$lt_save_ifs"
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
@@ -4099,7 +4081,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi[45]*)
+bsdi4*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
@@ -4122,13 +4104,13 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | kfreebsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -4144,7 +4126,7 @@
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
+  case "$host_cpu" in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
[...14261 lines suppressed...]
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
-
-
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 compiler_RC=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
 lt_cv_prog_compiler_c_o_RC=yes
 
 # The else clause should only fire when bootstrapping the
@@ -18307,7 +18840,7 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18408,12 +18941,6 @@
 # The host system.
 host_alias=$host_alias
 host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -18425,18 +18952,12 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
 # A language-specific compiler.
 CC=$lt_compiler_RC
 
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18496,7 +19017,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 
-# Must we lock files when doing compilation?
+# Must we lock files when doing compilation ?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -18570,11 +19091,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18586,7 +19107,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18666,7 +19187,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23101,6 +23622,16 @@
 #define OS_hpux 1
 _ACEOF
 
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_C_SOURCE 199506L
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _HPUX_SOURCE 1
+_ACEOF
+
     platform="hpux"
     ;;
   hppa*-hp-hpux*)
@@ -23139,6 +23670,16 @@
 #define OS_hpux 1
 _ACEOF
 
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_C_SOURCE 199506L
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _HPUX_SOURCE 1
+_ACEOF
+
     platform="hpux"
     ;;
   sparc-sun-solaris*)
@@ -23218,6 +23759,16 @@
 
 
 
+if test "$platform" = "hpux"; then
+  HPUX_TRUE=
+  HPUX_FALSE='#'
+else
+  HPUX_TRUE='#'
+  HPUX_FALSE=
+fi
+
+
+
 if test "$platform" = "solaris"; then
   SOLARIS_TRUE=
   SOLARIS_FALSE='#'
@@ -25053,6 +25604,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HPUX_TRUE}" && test -z "${HPUX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"HPUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HPUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${SOLARIS_TRUE}" && test -z "${SOLARIS_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"SOLARIS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -25647,7 +26205,6 @@
 s, at CCDEPMODE@,$CCDEPMODE,;t t
 s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at SED@,$SED,;t t
 s, at EGREP@,$EGREP,;t t
 s, at LN_S@,$LN_S,;t t
 s, at ECHO@,$ECHO,;t t
@@ -25679,6 +26236,8 @@
 s, at LIBNSL@,$LIBNSL,;t t
 s, at LIBDL@,$LIBDL,;t t
 s, at initdir@,$initdir,;t t
+s, at HPUX_TRUE@,$HPUX_TRUE,;t t
+s, at HPUX_FALSE@,$HPUX_FALSE,;t t
 s, at SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
 s, at SOLARIS_FALSE@,$SOLARIS_FALSE,;t t
 s, at PKG_CONFIG@,$PKG_CONFIG,;t t


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.ac	13 Feb 2007 19:00:11 -0000	1.19
+++ configure.ac	16 Feb 2007 23:25:06 -0000	1.20
@@ -157,6 +157,8 @@
     AC_DEFINE([HPUX11_23], [1], [HP-UX 11.23])
     AC_DEFINE([CPU_ia64], [], [cpu type ia64])
     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
+    AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
+    AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
     platform="hpux"
     ;;
   hppa*-hp-hpux*)
@@ -167,6 +169,8 @@
     AC_DEFINE([HPUX11_11], [1], [HP-UX 11.11])
     AC_DEFINE([CPU_hppa], [], [cpu type pa-risc])
     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
+    AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
+    AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
     platform="hpux"
     ;;
   sparc-sun-solaris*)
@@ -197,6 +201,7 @@
 esac
 AC_SUBST(initdir)
 
+AM_CONDITIONAL(HPUX,test "$platform" = "hpux")
 AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
 
 # Check for library dependencies


Index: depcomp
===================================================================
RCS file: /cvs/dirsec/ldapserver/depcomp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- depcomp	13 Feb 2007 19:00:11 -0000	1.14
+++ depcomp	16 Feb 2007 23:25:06 -0000	1.15
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2004-05-31.23
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
 # 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
@@ -17,8 +17,8 @@
 
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -50,11 +50,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit $?
+    exit 0
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit $?
+    exit 0
     ;;
 esac
 
@@ -287,43 +287,36 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      # Dependencies are output in .lo.d with libtool 1.4.
+      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
+      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
+      # latter, because the former will be cleaned when $dir.libs is
+      # erased.
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir$base.o.d"
+      tmpdepfile3="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      tmpdepfile3="$dir$base.d"
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
       exit $stat
    fi
 
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   elif test -f "$tmpdepfile2"; then
+      tmpdepfile="$tmpdepfile2"
+   else
+      tmpdepfile="$tmpdepfile3"
+   fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -467,8 +460,7 @@
   done
 
   "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"


Index: install-sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/install-sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- install-sh	13 Feb 2007 19:00:11 -0000	1.14
+++ install-sh	16 Feb 2007 23:25:06 -0000	1.15
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2004-09-10.20
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -109,7 +109,7 @@
         shift
         continue;;
 
-    --help) echo "$usage"; exit $?;;
+    --help) echo "$usage"; exit 0;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -134,7 +134,7 @@
 	shift
 	continue;;
 
-    --version) echo "$0 $scriptversion"; exit $?;;
+    --version) echo "$0 $scriptversion"; exit 0;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.
@@ -213,7 +213,7 @@
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -226,8 +226,7 @@
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
     IFS=$oIFS
 
     pathcomp=
@@ -296,7 +295,7 @@
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
+		 (exit 1); exit
 	       }
 	     else
 	       :
@@ -307,12 +306,12 @@
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
     }
-  fi || { (exit 1); exit 1; }
+  fi || { (exit 1); exit; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit 0
+  (exit 0); exit
 }
 
 # Local variables:


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ltmain.sh	12 Feb 2007 19:39:03 -0000	1.9
+++ ltmain.sh	16 Feb 2007 23:25:06 -0000	1.10
@@ -46,16 +46,10 @@
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" ; then
   setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -111,14 +105,12 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-         save_$lt_var=\$$lt_var
-         $lt_var=C
-         export $lt_var
-       fi"
-done
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -144,8 +136,6 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -337,17 +327,7 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-       *" $my_xlib_u "*)
-         extracted_serial=`expr $extracted_serial + 1`
-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
-       *) break ;;
-       esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -778,7 +758,6 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
-    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1159,9 +1138,8 @@
     for arg
     do
       case $arg in
-      -all-static | -static | -static-libtool-libs)
-    case $arg in
-    -all-static)
+      -all-static | -static)
+	if test "X$arg" = "X-all-static"; then
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1169,20 +1147,12 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	  ;;
-    -static)
+	else
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	  ;;
-    -static-libtool-libs)
-      if test -z "$pic_flag" && test -n "$link_static_flag"; then
-        dlopen_self=$dlopen_self_static
-      fi
-      prefer_static_libs=yes
-      ;;
-    esac
+	fi
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1742,7 +1712,7 @@
 	continue
 	;;
 
-      -static | -static-libtool-libs)
+      -static)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2520,9 +2490,7 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-         { { test "$prefer_static_libs" = no ||
-             test "$prefer_static_libs,$installed" = "built,yes"; } ||
-           test -z "$old_library"; }; then
+	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3218,7 +3186,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows|none)
+	  darwin|linux|osf|windows)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3442,11 +3410,11 @@
       fi
 
       # Eliminate all temporary directories.
-#      for path in $notinst_path; do
-#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-#      done
+      for path in $notinst_path; do
+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3547,12 +3515,13 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+	  if test "$?" -eq 0 ; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
+              if test "$name" != "" && test "$name" -ne "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3591,7 +3560,9 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		$LTCC $LTCFLAGS -o conftest conftest.c $i
+		# Did it work?
+		if test "$?" -eq 0 ; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3623,7 +3594,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
+		  $echo "***  make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4268,14 +4239,12 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
+      # -Wl from whole_archive_flag_spec
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4723,16 +4692,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
             else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
             ;;
           esac
 	  ;;
@@ -4747,13 +4716,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4840,7 +4809,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4877,7 +4846,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi
 
       # Quote $echo for shipping.
@@ -5284,18 +5253,6 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5438,7 +5395,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5624,7 +5581,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5969,9 +5926,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6180,7 +6137,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6456,15 +6413,12 @@
       fi
 
       # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-       eval "if test \"\${save_$lt_var+set}\" = set; then
-               $lt_var=\$save_$lt_var; export $lt_var
-             else
-               $lt_unset $lt_var
-             fi"
-      done
-
+      if test "${save_LC_ALL+set}" = set; then
+	LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+	LANG="$save_LANG"; export LANG
+      fi
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6821,9 +6775,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
+		    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
+		    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6837,11 +6791,9 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
+		    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 


Index: missing
===================================================================
RCS file: /cvs/dirsec/ldapserver/missing,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- missing	13 Feb 2007 19:00:11 -0000	1.14
+++ missing	16 Feb 2007 23:25:06 -0000	1.15
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2004-09-07.08
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
@@ -19,8 +19,8 @@
 
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake at gnu.org>."
-    exit $?
+    exit 0
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
-    exit $?
+    exit 0
     ;;
 
   -*)
@@ -288,18 +288,11 @@
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
     touch $file
     ;;
 



From fedora-directory-commits at redhat.com  Sat Feb 17 01:20:33 2007
From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea))
Date: Fri, 16 Feb 2007 20:20:33 -0500
Subject: [Fedora-directory-commits] coolkey/src/coolkey Makefile.am, 1.8,
	1.9 Makefile.in, 1.11, 1.12
Message-ID: <200702170120.l1H1KXIF029129@cvs-int.fedora.redhat.com>

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29110/src/coolkey

Modified Files:
	Makefile.am Makefile.in 
Log Message:


Match the distribution location of zlib1.dll when installing it.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	16 Feb 2007 23:04:51 -0000	1.8
+++ Makefile.am	17 Feb 2007 01:20:31 -0000	1.9
@@ -76,7 +76,7 @@
 if IS_WINDOWS
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.lib
 	mv $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.dll $(DESTDIR)$(pkcs11dir)/coolkeypk11.dll
-	cp $(ZLIB_LIB)/zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll
+	cp $(ZLIB_LIB)/../zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll
 endif
 
 


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in	16 Feb 2007 23:04:51 -0000	1.11
+++ Makefile.in	17 Feb 2007 01:20:31 -0000	1.12
@@ -729,7 +729,7 @@
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
 @IS_WINDOWS_TRUE@	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.lib
 @IS_WINDOWS_TRUE@	mv $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.dll $(DESTDIR)$(pkcs11dir)/coolkeypk11.dll
- at IS_WINDOWS_TRUE@	cp $(ZLIB_LIB)/zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll
+ at IS_WINDOWS_TRUE@	cp $(ZLIB_LIB)/../zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:



From fedora-directory-commits at redhat.com  Mon Feb 19 23:55:07 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 19 Feb 2007 18:55:07 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.26,
	1.27 configure.ac, 1.20, 1.21 config.h.in, 1.3, 1.4 aclocal.m4,
	1.20, 1.21 configure, 1.29, 1.30 missing, 1.15,
	1.16 install-sh, 1.15, 1.16 compile, 1.15, 1.16 depcomp, 1.15,
	1.16 config.sub, 1.14, 1.15 config.guess, 1.14,
	1.15 Makefile.in, 1.30, 1.31
Message-ID: <200702192355.l1JNt7NZ012645@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12603/ldapserver

Modified Files:
	Makefile.am configure.ac config.h.in aclocal.m4 configure 
	missing install-sh compile depcomp config.sub config.guess 
	Makefile.in 
Log Message:
Resolves: bug 229286
Bug Description: Solaris build: link shared libs correctly with libtool
Reviewed by: nkinder, prowley (Thanks!)
Fix Description: We have to use the $(CXXLINK) Makefile macro to build shared libs that use C++ code or link with C++ libs.  In addition, Sun C++ link needs -lCstd and -lCrun.  I added AC_DISABLE_STATIC so that we wouldn't generate all the .a libs we don't use.  Lastly, but not leastly, libtool on rhel/fedora has a "feature" that adds several gcc-isms to the libtool script generated by configure.  At best, these cause builds with non-gcc compilers to complain quite a bit, and at worst, cause the build to fail.  I've added a sed command in configure to remove these gcc-isms from libtool on non-gcc platforms.
Platforms tested: RHEL4, FC6, Solaris 9
Flag Day: no
Doc impact: no



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.am	16 Feb 2007 23:25:06 -0000	1.26
+++ Makefile.am	19 Feb 2007 23:55:04 -0000	1.27
@@ -46,6 +46,8 @@
 LIBSOCKET=@LIBSOCKET@
 LIBNSL=@LIBNSL@
 LIBDL=@LIBDL@
+LIBCSTD=@LIBCSTD@
+LIBCRUN=@LIBCRUN@
 
 #------------------------
 # Generated Sources
@@ -495,8 +497,9 @@
 	ldap/servers/plugins/acl/aclutil.c
 
 libacl_plugin_la_CPPFLAGS = -I$(srcdir)/include/libaccess $(PLUGIN_CPPFLAGS)
-libacl_plugin_la_LIBADD = libns-dshttpd.la
+libacl_plugin_la_LIBADD = libns-dshttpd.la $(LIBCSTD) $(LIBCRUN)
 libacl_plugin_la_LDFLAGS = -avoid-version
+libacl_plugin_la_LINK = $(CXXLINK)
 
 #------------------------
 # libattr-unique-plugin
@@ -583,8 +586,9 @@
 	ldap/servers/plugins/collation/orfilter.c
 
 libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
-libcollation_plugin_la_LIBADD = $(ICU_LINK)
+libcollation_plugin_la_LIBADD = $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
 libcollation_plugin_la_LDFLAGS = -avoid-version
+libcollation_plugin_la_LINK = $(CXXLINK)
 
 #------------------------
 # libpam-passthru-plugin


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure.ac	16 Feb 2007 23:25:06 -0000	1.20
+++ configure.ac	19 Feb 2007 23:55:04 -0000	1.21
@@ -13,6 +13,8 @@
 AC_PROG_CXX
 AC_PROG_CC
 AM_PROG_CC_C_O
+# disable static libs by default - we only use a couple
+AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 # Checks for header files.
@@ -185,12 +187,18 @@
     AC_DEFINE([sunos5], [1], [SunOS5])
     AC_DEFINE([OSVERSION], [509], [OS version])
     AC_DEFINE([_REENTRANT], [1], [_REENTRANT])
+dnl socket nsl and dl are required to link several programs and libdb
     LIBSOCKET=-lsocket
     AC_SUBST([LIBSOCKET], [$LIBSOCKET])
     LIBNSL=-lnsl
     AC_SUBST([LIBNSL], [$LIBNSL])
     LIBDL=-ldl
     AC_SUBST([LIBDL], [$LIBDL])
+dnl Cstd and Crun are required to link any C++ related code
+    LIBCSTD=-lCstd
+    AC_SUBST([LIBCSTD], [$LIBCSTD])
+    LIBCRUN=-lCrun
+    AC_SUBST([LIBCRUN], [$LIBCRUN])
     platform="solaris"
     # relative to sysconfdir
     initdir=/init.d
@@ -247,6 +255,28 @@
 AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag])
 AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
 
+
+# libtool on fedora/rhel contains some gcc-isms which cause problems
+# if not using gcc (e.g. Forte on Solaris, aCC on HP-UX)
+# we remove them here
+if test "$GCC" != yes ; then
+   AC_MSG_NOTICE([Not using gcc - fixing libtool to remove gcc-isms . . .])
+   cp -p libtool libtool.orig
+   cp -p libtool libtool.tmp
+   # dnl note the special chars @<:@ and @:>@ - since m4 treats [ and ] specially,
+   # we have to use the quadrigraph @<:@ for [ and @:>@ for ] - and you thought
+   # perl produced write-only code . . .
+   sed -e '/^gcc_dir/ d' \
+       -e '/^gcc_ver/ d' \
+       -e 's/^predep_objects=.*echo \("@<:@^"@:>@*"\).*$/predep_objects=\1/' \
+       -e 's/^postdep_objects=.*echo \("@<:@^"@:>@*"\).*$/postdep_objects=\1/' \
+       -e 's/^compiler_lib_search_path=.*echo \("@<:@^"@:>@*"\).*$/compiler_lib_search_path=\1/' \
+       -e 's/^sys_lib_search_path_spec=.*echo \("@<:@^"@:>@*"\).*$/sys_lib_search_path_spec=\1/' \
+       libtool > libtool.tmp
+   cp -p libtool.tmp libtool
+   rm -f libtool.tmp
+fi
+
 AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT




View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.20 -r 1.21 aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- aclocal.m4	16 Feb 2007 23:25:06 -0000	1.20
+++ aclocal.m4	19 Feb 2007 23:55:04 -0000	1.21
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -123,7 +123,7 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -143,7 +143,7 @@
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -163,6 +163,7 @@
 test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
 test -z "$LN_S" && LN_S="ln -s"
@@ -182,15 +183,17 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+_LT_CC_BASENAME([$compiler])
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -231,11 +234,56 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
+
+
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -308,15 +356,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -485,7 +533,7 @@
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -536,6 +584,22 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)    LD="${LD-ld} -64" ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -567,7 +631,7 @@
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -577,8 +641,10 @@
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
[...3355 lines suppressed...]
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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.
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -6694,27 +7032,16 @@
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -6768,26 +7095,15 @@
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Helper functions for option handling.                     -*- Autoconf -*-
 
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -6812,28 +7128,16 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-#
-# Check to make sure that the build environment is sane.
-#
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_SANITY_CHECK
 # ---------------
@@ -6876,25 +7180,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# AM_PROG_INSTALL_STRIP
+# ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -6917,25 +7210,13 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004  Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.29 -r 1.30 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- configure	16 Feb 2007 23:25:06 -0000	1.29
+++ configure	19 Feb 2007 23:55:04 -0000	1.30
@@ -280,15 +280,15 @@
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
 XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1031,10 +1031,10 @@
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-static[=PKGS]
+                          build static libraries [default=no]
   --enable-shared[=PKGS]
                           build shared libraries [default=yes]
-  --enable-static[=PKGS]
-                          build static libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
@@ -3729,52 +3729,54 @@
    CC="$am_aux_dir/compile $CC"
 fi
 
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
+# disable static libs by default - we only use a couple
+# Check whether --enable-static or --disable-static was given.
+if test "${enable_static+set}" = set; then
+  enableval="$enable_static"
   p=${PACKAGE-default}
     case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
     *)
-      enable_shared=no
+     enable_static=no
       # Look at the argument we got.  We use all the common list separators.
       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
       for pkg in $enableval; do
 	IFS="$lt_save_ifs"
 	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
+	  enable_static=yes
 	fi
       done
       IFS="$lt_save_ifs"
       ;;
     esac
 else
-  enable_shared=yes
+  enable_static=no
 fi;
 
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
+
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval="$enable_shared"
   p=${PACKAGE-default}
     case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
     *)
-     enable_static=no
+      enable_shared=no
       # Look at the argument we got.  We use all the common list separators.
       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
       for pkg in $enableval; do
 	IFS="$lt_save_ifs"
 	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
+	  enable_shared=yes
 	fi
       done
       IFS="$lt_save_ifs"
       ;;
     esac
 else
-  enable_static=yes
+  enable_shared=yes
 fi;
 
 # Check whether --enable-fast-install or --disable-fast-install was given.
@@ -3821,12 +3823,13 @@
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -3851,10 +3854,11 @@
     fi
   done
 done
-SED=$lt_cv_path_SED
 
 fi
 
+SED=$lt_cv_path_SED
+
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -3931,7 +3935,7 @@
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -3965,7 +3969,7 @@
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -3995,6 +3999,15 @@
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -4005,36 +4018,43 @@
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
[...8694 lines suppressed...]
 # a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18742,7 +18184,7 @@
 link_all_deplibs=$link_all_deplibs_GCJ
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18816,15 +18258,42 @@
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 compiler_RC=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 lt_cv_prog_compiler_c_o_RC=yes
 
 # The else clause should only fire when bootstrapping the
@@ -18840,7 +18309,7 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18941,6 +18410,12 @@
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -18952,12 +18427,18 @@
 # A C compiler.
 LTCC=$lt_LTCC
 
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
 # A language-specific compiler.
 CC=$lt_compiler_RC
 
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
 
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -19017,7 +18498,7 @@
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -19091,11 +18572,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -19107,7 +18588,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -19187,7 +18668,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23747,6 +23228,12 @@
     LIBDL=-ldl
     LIBDL=$LIBDL
 
+    LIBCSTD=-lCstd
+    LIBCSTD=$LIBCSTD
+
+    LIBCRUN=-lCrun
+    LIBCRUN=$LIBCRUN
+
     platform="solaris"
     # relative to sysconfdir
     initdir=/init.d
@@ -25468,6 +24955,29 @@
 _ACEOF
 
 
+
+# libtool on fedora/rhel contains some gcc-isms which cause problems
+# if not using gcc (e.g. Forte on Solaris, aCC on HP-UX)
+# we remove them here
+if test "$GCC" != yes ; then
+   { echo "$as_me:$LINENO: Not using gcc - fixing libtool to remove gcc-isms . . ." >&5
+echo "$as_me: Not using gcc - fixing libtool to remove gcc-isms . . ." >&6;}
+   cp -p libtool libtool.orig
+   cp -p libtool libtool.tmp
+   # dnl note the special chars [ and ] - since m4 treats [ and ] specially,
+   # we have to use the quadrigraph [ for [ and ] for ] - and you thought
+   # perl produced write-only code . . .
+   sed -e '/^gcc_dir/ d' \
+       -e '/^gcc_ver/ d' \
+       -e 's/^predep_objects=.*echo \("[^"]*"\).*$/predep_objects=\1/' \
+       -e 's/^postdep_objects=.*echo \("[^"]*"\).*$/postdep_objects=\1/' \
+       -e 's/^compiler_lib_search_path=.*echo \("[^"]*"\).*$/compiler_lib_search_path=\1/' \
+       -e 's/^sys_lib_search_path_spec=.*echo \("[^"]*"\).*$/sys_lib_search_path_spec=\1/' \
+       libtool > libtool.tmp
+   cp -p libtool.tmp libtool
+   rm -f libtool.tmp
+fi
+
           ac_config_files="$ac_config_files Makefile"
 
 
@@ -26205,6 +25715,7 @@
 s, at CCDEPMODE@,$CCDEPMODE,;t t
 s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s, at SED@,$SED,;t t
 s, at EGREP@,$EGREP,;t t
 s, at LN_S@,$LN_S,;t t
 s, at ECHO@,$ECHO,;t t
@@ -26235,6 +25746,8 @@
 s, at LIBSOCKET@,$LIBSOCKET,;t t
 s, at LIBNSL@,$LIBNSL,;t t
 s, at LIBDL@,$LIBDL,;t t
+s, at LIBCSTD@,$LIBCSTD,;t t
+s, at LIBCRUN@,$LIBCRUN,;t t
 s, at initdir@,$initdir,;t t
 s, at HPUX_TRUE@,$HPUX_TRUE,;t t
 s, at HPUX_FALSE@,$HPUX_FALSE,;t t


Index: missing
===================================================================
RCS file: /cvs/dirsec/ldapserver/missing,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- missing	16 Feb 2007 23:25:06 -0000	1.15
+++ missing	19 Feb 2007 23:55:04 -0000	1.16
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2004-09-07.08
+scriptversion=2005-06-08.21
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
@@ -19,8 +19,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake at gnu.org>."
-    exit 0
+    exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
-    exit 0
+    exit $?
     ;;
 
   -*)
@@ -288,11 +288,18 @@
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
     touch $file
     ;;
 


Index: install-sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/install-sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- install-sh	16 Feb 2007 23:25:06 -0000	1.15
+++ install-sh	19 Feb 2007 23:55:04 -0000	1.16
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-09-10.20
+scriptversion=2005-05-14.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -109,7 +109,7 @@
         shift
         continue;;
 
-    --help) echo "$usage"; exit 0;;
+    --help) echo "$usage"; exit $?;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -134,7 +134,7 @@
 	shift
 	continue;;
 
-    --version) echo "$0 $scriptversion"; exit 0;;
+    --version) echo "$0 $scriptversion"; exit $?;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.
@@ -213,7 +213,7 @@
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -226,7 +226,8 @@
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
     IFS=$oIFS
 
     pathcomp=
@@ -295,7 +296,7 @@
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit
+		 (exit 1); exit 1
 	       }
 	     else
 	       :
@@ -306,12 +307,12 @@
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
     }
-  fi || { (exit 1); exit; }
+  fi || { (exit 1); exit 1; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit
+  (exit 0); exit 0
 }
 
 # Local variables:


Index: compile
===================================================================
RCS file: /cvs/dirsec/ldapserver/compile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- compile	16 Feb 2007 23:25:06 -0000	1.15
+++ compile	19 Feb 2007 23:55:04 -0000	1.16
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2004-09-10.20
+scriptversion=2005-05-14.22
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,11 +47,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -125,6 +125,8 @@
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"


Index: depcomp
===================================================================
RCS file: /cvs/dirsec/ldapserver/depcomp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- depcomp	16 Feb 2007 23:25:06 -0000	1.15
+++ depcomp	19 Feb 2007 23:55:04 -0000	1.16
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2004-05-31.23
+scriptversion=2005-07-09.11
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # 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
@@ -17,8 +17,8 @@
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -50,11 +50,11 @@
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -287,36 +287,43 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mecanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
       "$@" -Wc,-MD
    else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
       exit $stat
    fi
 
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -460,7 +467,8 @@
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"


Index: config.sub
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.sub,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config.sub	16 Feb 2007 23:25:06 -0000	1.14
+++ config.sub	19 Feb 2007 23:55:04 -0000	1.15
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-08-29'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@
 #
 # 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -231,13 +232,14 @@
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -246,6 +248,7 @@
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -254,23 +257,28 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -298,7 +306,7 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -310,7 +318,7 @@
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -319,6 +327,7 @@
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -327,6 +336,7 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -334,20 +344,23 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -489,6 +502,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -754,9 +771,8 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1029,6 +1045,10 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1078,12 +1098,9 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1170,7 +1187,8 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1188,7 +1206,7 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1297,6 +1315,9 @@
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1374,6 +1395,9 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1545,7 +1569,7 @@
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)


Index: config.guess
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.guess,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config.guess	16 Feb 2007 23:25:06 -0000	1.14
+++ config.guess	19 Feb 2007 23:55:04 -0000	1.15
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-09-07'
+timestamp='2005-07-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per at bothner.com>.
 # Please send patches to <config-patches at gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +68,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -123,7 +125,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi at noc.rutgers.edu 1994-08-24)
@@ -196,55 +198,20 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,37 +264,43 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -335,32 +308,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -369,10 +342,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -384,10 +357,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -398,40 +371,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -455,32 +428,33 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -496,29 +470,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -526,7 +500,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -541,14 +515,18 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -562,28 +540,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -645,9 +623,19 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -655,11 +643,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -687,158 +675,166 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
+	exit ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -856,7 +852,7 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -875,14 +871,14 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -896,7 +892,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -904,25 +900,25 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -940,15 +936,15 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -976,15 +972,18 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -992,27 +991,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1020,15 +1019,16 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1046,73 +1046,73 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1120,61 +1120,65 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel at ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf at swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green at stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green at stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1182,7 +1186,7 @@
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1190,22 +1194,25 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1216,38 +1223,44 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1279,7 +1292,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1368,11 +1381,12 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1381,22 +1395,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1407,7 +1421,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.30 -r 1.31 Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.in	16 Feb 2007 23:25:06 -0000	1.30
+++ Makefile.in	19 Feb 2007 23:55:04 -0000	1.31
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +18,6 @@
 
 
 
-SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES!
 ) $(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -102,7 +100,9 @@
 serverLTLIBRARIES_INSTALL = $(INSTALL)
 serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
-libacl_plugin_la_DEPENDENCIES = libns-dshttpd.la
+am__DEPENDENCIES_1 =
+libacl_plugin_la_DEPENDENCIES = libns-dshttpd.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_libacl_plugin_la_OBJECTS =  \
 	ldap/servers/plugins/acl/libacl_plugin_la-acl.lo \
 	ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo \
@@ -124,7 +124,6 @@
 	ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo
 libattr_unique_plugin_la_OBJECTS =  \
 	$(am_libattr_unique_plugin_la_OBJECTS)
-am__DEPENDENCIES_1 =
 libback_ldbm_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1)
 am_libback_ldbm_la_OBJECTS =  \
 	ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo \
@@ -214,7 +213,8 @@
 	ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_utils.lo
 libchainingdb_plugin_la_OBJECTS =  \
 	$(am_libchainingdb_plugin_la_OBJECTS)
-libcollation_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libcollation_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libcollation_plugin_la_OBJECTS = ldap/servers/plugins/collation/libcollation_plugin_la-collate.lo \
 	ldap/servers/plugins/collation/libcollation_plugin_la-config.lo \
 	ldap/servers/plugins/collation/libcollation_plugin_la-orfilter.lo
@@ -687,19 +687,19 @@
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \
 	$(libacl_plugin_la_SOURCES) \
@@ -809,6 +809,8 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
+LIBCRUN = @LIBCRUN@
+LIBCSTD = @LIBCSTD@
 LIBDL = @LIBDL@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
@@ -832,6 +834,7 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -1375,8 +1378,9 @@
 	ldap/servers/plugins/acl/aclutil.c
 
 libacl_plugin_la_CPPFLAGS = -I$(srcdir)/include/libaccess $(PLUGIN_CPPFLAGS)
-libacl_plugin_la_LIBADD = libns-dshttpd.la
+libacl_plugin_la_LIBADD = libns-dshttpd.la $(LIBCSTD) $(LIBCRUN)
 libacl_plugin_la_LDFLAGS = -avoid-version
+libacl_plugin_la_LINK = $(CXXLINK)
 
 #------------------------
 # libattr-unique-plugin
@@ -1462,8 +1466,9 @@
 	ldap/servers/plugins/collation/orfilter.c
 
 libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
-libcollation_plugin_la_LIBADD = $(ICU_LINK)
+libcollation_plugin_la_LIBADD = $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
 libcollation_plugin_la_LDFLAGS = -avoid-version
+libcollation_plugin_la_LINK = $(CXXLINK)
 
 #------------------------
 # libpam-passthru-plugin
@@ -2051,7 +2056,7 @@
 	ldap/servers/plugins/acl/$(am__dirstamp) \
 	ldap/servers/plugins/acl/$(DEPDIR)/$(am__dirstamp)
 libacl-plugin.la: $(libacl_plugin_la_OBJECTS) $(libacl_plugin_la_DEPENDENCIES) 
-	$(LINK) -rpath $(serverplugindir) $(libacl_plugin_la_LDFLAGS) $(libacl_plugin_la_OBJECTS) $(libacl_plugin_la_LIBADD) $(LIBS)
+	$(libacl_plugin_la_LINK) -rpath $(serverplugindir) $(libacl_plugin_la_LDFLAGS) $(libacl_plugin_la_OBJECTS) $(libacl_plugin_la_LIBADD) $(LIBS)
 ldap/servers/plugins/uiduniq/$(am__dirstamp):
 	@$(mkdir_p) ldap/servers/plugins/uiduniq
 	@: > ldap/servers/plugins/uiduniq/$(am__dirstamp)
@@ -2356,7 +2361,7 @@
 	ldap/servers/plugins/collation/$(am__dirstamp) \
 	ldap/servers/plugins/collation/$(DEPDIR)/$(am__dirstamp)
 libcollation-plugin.la: $(libcollation_plugin_la_OBJECTS) $(libcollation_plugin_la_DEPENDENCIES) 
-	$(LINK) -rpath $(serverplugindir) $(libcollation_plugin_la_LDFLAGS) $(libcollation_plugin_la_OBJECTS) $(libcollation_plugin_la_LIBADD) $(LIBS)
+	$(libcollation_plugin_la_LINK) -rpath $(serverplugindir) $(libcollation_plugin_la_LDFLAGS) $(libcollation_plugin_la_OBJECTS) $(libcollation_plugin_la_LIBADD) $(LIBS)
 ldap/servers/plugins/cos/$(am__dirstamp):
 	@$(mkdir_p) ldap/servers/plugins/cos
 	@: > ldap/servers/plugins/cos/$(am__dirstamp)
@@ -5100,2286 +5105,2286 @@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi`
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo: ldap/servers/plugins/acl/acl_ext.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acl_ext.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo: ldap/servers/plugins/acl/aclanom.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclanom.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo: ldap/servers/plugins/acl/acleffectiverights.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acleffectiverights.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo: ldap/servers/plugins/acl/aclgroup.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclgroup.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo: ldap/servers/plugins/acl/aclinit.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/aclinit.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c
 
 ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo: ldap/servers/plugins/acl/acllas.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/plugins/acl/acllas.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo' libtool=yes @AMDEPBACKSLASH@
[...3042 lines suppressed...]
 lib/libaccess/libns_dshttpd_la-nseframe.lo: lib/libaccess/nseframe.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nseframe.cpp' object='lib/libaccess/libns_dshttpd_la-nseframe.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp
 
 lib/libaccess/libns_dshttpd_la-nsautherr.lo: lib/libaccess/nsautherr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/nsautherr.cpp' object='lib/libaccess/libns_dshttpd_la-nsautherr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp
 
 lib/libaccess/libns_dshttpd_la-oneeval.lo: lib/libaccess/oneeval.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/oneeval.cpp' object='lib/libaccess/libns_dshttpd_la-oneeval.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp
 
 lib/libaccess/libns_dshttpd_la-register.lo: lib/libaccess/register.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/register.cpp' object='lib/libaccess/libns_dshttpd_la-register.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp
 
 lib/libaccess/libns_dshttpd_la-symbols.lo: lib/libaccess/symbols.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/symbols.cpp' object='lib/libaccess/libns_dshttpd_la-symbols.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp
 
 lib/libaccess/libns_dshttpd_la-usi.lo: lib/libaccess/usi.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usi.cpp' object='lib/libaccess/libns_dshttpd_la-usi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp
 
 lib/libaccess/libns_dshttpd_la-usrcache.lo: lib/libaccess/usrcache.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/libaccess/usrcache.cpp' object='lib/libaccess/libns_dshttpd_la-usrcache.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp
 
 lib/base/libns_dshttpd_la-crit.lo: lib/base/crit.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/crit.cpp' object='lib/base/libns_dshttpd_la-crit.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp
 
 lib/base/libns_dshttpd_la-dns.lo: lib/base/dns.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dns.cpp' object='lib/base/libns_dshttpd_la-dns.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp
 
 lib/base/libns_dshttpd_la-dnsdmain.lo: lib/base/dnsdmain.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/dnsdmain.cpp' object='lib/base/libns_dshttpd_la-dnsdmain.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp
 
 lib/base/libns_dshttpd_la-ereport.lo: lib/base/ereport.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/ereport.cpp' object='lib/base/libns_dshttpd_la-ereport.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp
 
 lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp
 
 lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp
 
 lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp
 
 lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp
 
 lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp
 
 lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp
 
 lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp
 
 lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp
 
 lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp
 
 lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp
 
 lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp
- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
+ at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \
 @am__fastdepCXX_TRUE@	then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo



From fedora-directory-commits at redhat.com  Wed Feb 21 17:44:16 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 21 Feb 2007 12:44:16 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.27,
	1.28 Makefile.in, 1.31, 1.32 ltmain.sh, 1.10, 1.11
Message-ID: <200702211744.l1LHiGlv008515@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8430

Modified Files:
	Makefile.am Makefile.in ltmain.sh 
Log Message:
Resolves: 229428
Summary: ns-slapd needs to be linked with the C++ compiler on HP-UX.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.am	19 Feb 2007 23:55:04 -0000	1.27
+++ Makefile.am	21 Feb 2007 17:44:13 -0000	1.28
@@ -910,6 +910,11 @@
 	@nspr_inc@ @svrcore_inc@
 ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \
 	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET)
+# We need to link ns-slapd with the C++ compiler on HP-UX since we load
+# some C++ shared libraries (such as icu).
+if HPUX
+ns_slapd_LINK = $(CXXLINK)
+endif
 
 #------------------------
 # pwdhash


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.in	19 Feb 2007 23:55:04 -0000	1.31
+++ Makefile.in	21 Feb 2007 17:44:13 -0000	1.32
@@ -1778,6 +1778,9 @@
 ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \
 	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET)
 
+# We need to link ns-slapd with the C++ compiler on HP-UX since we load
+# some C++ shared libraries (such as icu).
+ at HPUX_TRUE@ns_slapd_LINK = $(CXXLINK)
 
 #------------------------
 # pwdhash
@@ -3615,7 +3618,7 @@
 	ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp)
 ns-slapd$(EXEEXT): $(ns_slapd_OBJECTS) $(ns_slapd_DEPENDENCIES) 
 	@rm -f ns-slapd$(EXEEXT)
-	$(LINK) $(ns_slapd_LDFLAGS) $(ns_slapd_OBJECTS) $(ns_slapd_LDADD) $(LIBS)
+	$(ns_slapd_LINK) $(ns_slapd_LDFLAGS) $(ns_slapd_OBJECTS) $(ns_slapd_LDADD) $(LIBS)
 ldap/servers/slapd/tools/pwdhash_bin-pwenc.$(OBJEXT):  \
 	ldap/servers/slapd/tools/$(am__dirstamp) \
 	ldap/servers/slapd/tools/$(DEPDIR)/$(am__dirstamp)


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ltmain.sh	16 Feb 2007 23:25:06 -0000	1.10
+++ ltmain.sh	21 Feb 2007 17:44:13 -0000	1.11
@@ -46,10 +46,16 @@
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -105,12 +111,14 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+         save_$lt_var=\$$lt_var
+         $lt_var=C
+         export $lt_var
+       fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +144,8 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -327,7 +337,17 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         extracted_serial=`expr $extracted_serial + 1`
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+    case $arg in
+    -all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1169,20 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+    -static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+    -static-libtool-libs)
+      if test -z "$pic_flag" && test -n "$link_static_flag"; then
+        dlopen_self=$dlopen_self_static
+      fi
+      prefer_static_libs=yes
+      ;;
+    esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1712,7 +1742,7 @@
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+         { { test "$prefer_static_libs" = no ||
+             test "$prefer_static_libs,$installed" = "built,yes"; } ||
+           test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3410,11 +3442,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+#      for path in $notinst_path; do
+#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+#      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3591,7 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4239,12 +4268,14 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4747,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4877,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5624,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +5969,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+               $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
+
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6837,11 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 



From fedora-directory-commits at redhat.com  Wed Feb 21 21:22:09 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 21 Feb 2007 16:22:09 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src ds_newinst.pl,
	1.12, NONE
Message-ID: <200702212122.l1LLM9C1026349@cvs-int.fedora.redhat.com>

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26322

Removed Files:
	ds_newinst.pl 
Log Message:
Resolves: 229576
Summary: clean up template-scriptname which is derived from template-scriptname.in



--- ds_newinst.pl DELETED ---



From fedora-directory-commits at redhat.com  Wed Feb 21 21:22:10 2007
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 21 Feb 2007 16:22:10 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
	template-bak2db, 1.2, NONE template-bak2db.pl, 1.8,
	NONE template-cl-dump.pl, 1.10, NONE template-db2bak, 1.2,
	NONE template-db2bak.pl, 1.7, NONE template-db2index, 1.2,
	NONE template-db2index.pl, 1.8, NONE template-db2ldif, 1.2,
	NONE template-db2ldif.pl, 1.7, NONE template-ldif2db, 1.2,
	NONE template-ldif2db.pl, 1.7, NONE template-ldif2ldap, 1.1,
	NONE template-monitor, 1.1, NONE template-ns-accountstatus.pl,
	1.7, NONE template-ns-activate.pl, 1.7,
	NONE template-ns-inactivate.pl, 1.7,
	NONE template-ns-newpwpolicy.pl, 1.8,
	NONE template-repl-monitor-cgi.pl, 1.8,
	NONE template-repl-monitor.pl, 1.8,
	NONE template-restoreconfig, 1.2, NONE template-saveconfig,
	1.2, NONE template-start-slapd, 1.3, NONE template-stop-slapd,
	1.3, NONE template-suffix2instance, 1.2,
	NONE template-verify-db.pl, 1.8, NONE template-vlvindex, 1.2, NONE
Message-ID: <200702212122.l1LLMAeF026354@cvs-int.fedora.redhat.com>

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26322/scripts

Removed Files:
	template-bak2db template-bak2db.pl template-cl-dump.pl 
	template-db2bak template-db2bak.pl template-db2index 
	template-db2index.pl template-db2ldif template-db2ldif.pl 
	template-ldif2db template-ldif2db.pl template-ldif2ldap 
	template-monitor template-ns-accountstatus.pl 
	template-ns-activate.pl template-ns-inactivate.pl 
	template-ns-newpwpolicy.pl template-repl-monitor-cgi.pl 
	template-repl-monitor.pl template-restoreconfig 
	template-saveconfig template-start-slapd template-stop-slapd 
	template-suffix2instance template-verify-db.pl 
	template-vlvindex 
Log Message:
Resolves: 229576
Summary: clean up template-scriptname which is derived from template-scriptname.in



--- template-bak2db DELETED ---


--- template-bak2db.pl DELETED ---


--- template-cl-dump.pl DELETED ---


--- template-db2bak DELETED ---


--- template-db2bak.pl DELETED ---


--- template-db2index DELETED ---


--- template-db2index.pl DELETED ---


--- template-db2ldif DELETED ---


--- template-db2ldif.pl DELETED ---


--- template-ldif2db DELETED ---


--- template-ldif2db.pl DELETED ---


--- template-ldif2ldap DELETED ---


--- template-monitor DELETED ---


--- template-ns-accountstatus.pl DELETED ---


--- template-ns-activate.pl DELETED ---


--- template-ns-inactivate.pl DELETED ---


--- template-ns-newpwpolicy.pl DELETED ---


--- template-repl-monitor-cgi.pl DELETED ---


--- template-repl-monitor.pl DELETED ---


--- template-restoreconfig DELETED ---


--- template-saveconfig DELETED ---


--- template-start-slapd DELETED ---


--- template-stop-slapd DELETED ---


--- template-suffix2instance DELETED ---


--- template-verify-db.pl DELETED ---


--- template-vlvindex DELETED ---



From fedora-directory-commits at redhat.com  Thu Feb 22 16:50:16 2007
From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten))
Date: Thu, 22 Feb 2007 11:50:16 -0500
Subject: [Fedora-directory-commits] mod_nss nss_engine_pphrase.c,1.9,1.10
Message-ID: <200702221650.l1MGoGQ2016892@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16875

Modified Files:
	nss_engine_pphrase.c 
Log Message:
229660

Log a warning on a malformed password file entry instead of dropping core.



Index: nss_engine_pphrase.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_pphrase.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nss_engine_pphrase.c	10 Jan 2007 20:56:00 -0000	1.9
+++ nss_engine_pphrase.c	22 Feb 2007 16:50:14 -0000	1.10
@@ -240,6 +240,11 @@
                         tmp--;
                     line[tmp+1] = '\0';
                     ptr = PL_strchr(line, ':');
+                    if (ptr == NULL) {
+                        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+                           "Malformed password entry for token %s. Format should be token:password", token_name);
+                        continue;
+                    }
                     for(tmp=1; ptr[tmp] == ' '; tmp++) {}
                     pwdstr = strdup(&(ptr[tmp]));
                 }



From fedora-directory-commits at redhat.com  Thu Feb 22 19:29:49 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 22 Feb 2007 14:29:49 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.28,
	1.29 Makefile.in, 1.32, 1.33
Message-ID: <200702221929.l1MJTnX7030441@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30306

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Resolves: 229428
Summary: Fixed issue with specifying linker to use for ns-slapd.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.am	21 Feb 2007 17:44:13 -0000	1.28
+++ Makefile.am	22 Feb 2007 19:29:47 -0000	1.29
@@ -914,6 +914,8 @@
 # some C++ shared libraries (such as icu).
 if HPUX
 ns_slapd_LINK = $(CXXLINK)
+else
+ns_slapd_LINK = $(LINK)
 endif
 
 #------------------------


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.in	21 Feb 2007 17:44:13 -0000	1.32
+++ Makefile.in	22 Feb 2007 19:29:47 -0000	1.33
@@ -1778,6 +1778,7 @@
 ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \
 	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET)
 
+ at HPUX_FALSE@ns_slapd_LINK = $(LINK)
 # We need to link ns-slapd with the C++ compiler on HP-UX since we load
 # some C++ shared libraries (such as icu).
 @HPUX_TRUE at ns_slapd_LINK = $(CXXLINK)



From fedora-directory-commits at redhat.com  Thu Feb 22 23:59:20 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 22 Feb 2007 18:59:20 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
	create_instance.c, 1.44, 1.45
Message-ID: <200702222359.l1MNxK29015300@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15253/ldapserver/ldap/admin/src

Modified Files:
	create_instance.c 
Log Message:
Resolves: bug 229691
Bug Description: Add enable switches for optional/experimental features
Reviewed by: nkinder, nhosoi, prowley (Thanks!)
Fix Description: Added --enable-pam-passthru, --enable-dna, and --enable-ldapi.  They are all on by default and must be explicitly disabled (--disable-pam-passthru).  These all cause ENABLE_xxx to be defined for C code so that we can enclose the code in #ifdef ENABLE_PAM_PASSTHRU blocks, for example.  For the first two, these also cause the plugins to be built - so that if you specify --disable-pam-passthru, the plugin code will not be built at all.  I discovered a nifty autoconf macro called AS_HELP_STRING - this nicely formats the help messages output by configure --help.  I don't know if it's worth going through all of our m4 code to use this, but I went ahead and fixed configure.ac.  Create instance will now add plugin configuration entries (but disabled) for pam passthru and dna if the corresponding ENABLE_ macros are defined.  I also fixed a bug with passthru (not pam passthru) - the plugin configuration entry was not being added.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no 



Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- create_instance.c	9 Feb 2007 22:33:58 -0000	1.44
+++ create_instance.c	22 Feb 2007 23:59:13 -0000	1.45
@@ -3149,7 +3149,8 @@
 #endif
 
     /* enable pass thru authentication */
-    if (cf->use_existing_config_ds || cf->use_existing_user_ds)
+    if ((cf->use_existing_config_ds && cf->config_ldap_url) ||
+        (cf->use_existing_user_ds && cf->user_ldap_url))
     {
         LDAPURLDesc *desc = 0;
         char *url = cf->use_existing_config_ds ? cf->config_ldap_url :
@@ -3195,7 +3196,7 @@
         fprintf(f, "\n");
     }
 
-#ifdef BUILD_PAM_PASSTHRU
+#ifdef ENABLE_PAM_PASSTHRU
 #if !defined( XP_WIN32 )
     /* PAM Pass Through Auth plugin - off by default */
     fprintf(f, "dn: cn=PAM Pass Through Auth,cn=plugins,cn=config\n");
@@ -3215,13 +3216,27 @@
         fprintf(f, "pamExcludeSuffix: %s\n", cf->netscaperoot);
     }
     fprintf(f, "pamExcludeSuffix: cn=config\n");
-    fprintf(f, "pamMapMethod: RDN\n");
+    fprintf(f, "pamIDMapMethod: RDN\n");
+    fprintf(f, "pamIDAttr: notUsedWithRDNMethod\n");
     fprintf(f, "pamFallback: FALSE\n");
     fprintf(f, "pamSecure: TRUE\n");
     fprintf(f, "pamService: ldapserver\n");
     fprintf(f, "\n");
 #endif /* NO PAM FOR WINDOWS */
-#endif /* BUILD_PAM_PASSTHRU */
+#endif /* ENABLE_PAM_PASSTHRU */
+
+#ifdef ENABLE_DNA
+    fprintf(f, "dn: cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config\n");
+    fprintf(f, "objectclass: top\n");
+    fprintf(f, "objectclass: nsSlapdPlugin\n");
+    fprintf(f, "objectclass: extensibleObject\n");
+    fprintf(f, "objectclass: nsContainer\n");
+    fprintf(f, "cn: Distributed Numeric Assignment Plugin\n");
+    fprintf(f, "nsslapd-plugininitfunc: dna_init\n");
+    fprintf(f, "nsslapd-plugintype: preoperation\n");
+    fprintf(f, "nsslapd-pluginenabled: off\n");
+    fprintf(f, "nsslapd-pluginPath: %s/libdna-plugin%s\n", cf->plugin_dir, shared_lib);
+#endif /* ENABLE_DNA */
 
     fprintf(f, "dn: cn=ldbm database,cn=plugins,cn=config\n");
     fprintf(f, "objectclass: top\n");



From fedora-directory-commits at redhat.com  Thu Feb 22 23:59:15 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 22 Feb 2007 18:59:15 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.29,
	1.30 Makefile.in, 1.33, 1.34 config.h.in, 1.4, 1.5 configure,
	1.30, 1.31 configure.ac, 1.21, 1.22 aclocal.m4, 1.21,
	1.22 missing, 1.16, 1.17 install-sh, 1.16, 1.17 depcomp, 1.16,
	1.17 compile, 1.16, 1.17 config.sub, 1.15, 1.16 config.guess,
	1.15, 1.16
Message-ID: <200702222359.l1MNxjco015307@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15253/ldapserver

Modified Files:
	Makefile.am Makefile.in config.h.in configure configure.ac 
	aclocal.m4 missing install-sh depcomp compile config.sub 
	config.guess 
Log Message:
Resolves: bug 229691
Bug Description: Add enable switches for optional/experimental features
Reviewed by: nkinder, nhosoi, prowley (Thanks!)
Fix Description: Added --enable-pam-passthru, --enable-dna, and --enable-ldapi.  They are all on by default and must be explicitly disabled (--disable-pam-passthru).  These all cause ENABLE_xxx to be defined for C code so that we can enclose the code in #ifdef ENABLE_PAM_PASSTHRU blocks, for example.  For the first two, these also cause the plugins to be built - so that if you specify --disable-pam-passthru, the plugin code will not be built at all.  I discovered a nifty autoconf macro called AS_HELP_STRING - this nicely formats the help messages output by configure --help.  I don't know if it's worth going through all of our m4 code to use this, but I went ahead and fixed configure.ac.  Create instance will now add plugin configuration entries (but disabled) for pam passthru and dna if the corresponding ENABLE_ macros are defined.  I also fixed a bug with passthru (not pam passthru) - the plugin configuration entry was not being added.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no 



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.am	22 Feb 2007 19:29:47 -0000	1.29
+++ Makefile.am	22 Feb 2007 23:59:13 -0000	1.30
@@ -85,13 +85,21 @@
 
 server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
 
+# this is how to add optional plugins
+if enable_pam_passthru
+LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
+endif
+if enable_dna
+LIBDNA_PLUGIN = libdna-plugin.la
+endif
+
 serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \
 	libback-ldbm.la libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la \
-	libdistrib-plugin.la libdna-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
-	libpam-passthru-plugin.la libpassthru-plugin.la libpresence-plugin.la \
+	libdistrib-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
+	libpassthru-plugin.la libpresence-plugin.la \
 	libpwdstorage-plugin.la libreferint-plugin.la libreplication-plugin.la \
 	libretrocl-plugin.la libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \
-	libviews-plugin.la
+	libviews-plugin.la $(LIBPAM_PASSTHRU_PLUGIN) $(LIBDNA_PLUGIN)
 
 nodist_property_DATA = ns-slapd.properties
 


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile.in	22 Feb 2007 19:29:47 -0000	1.33
+++ Makefile.in	22 Feb 2007 23:59:13 -0000	1.34
@@ -237,6 +237,7 @@
 am_libdna_plugin_la_OBJECTS =  \
 	ldap/servers/plugins/dna/libdna_plugin_la-dna.lo
 libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS)
+ at enable_dna_TRUE@am_libdna_plugin_la_rpath = -rpath $(serverplugindir)
 libds_admin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_libds_admin_la_OBJECTS =  \
@@ -330,6 +331,8 @@
 	ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptpreop.lo
 libpam_passthru_plugin_la_OBJECTS =  \
 	$(am_libpam_passthru_plugin_la_OBJECTS)
+ at enable_pam_passthru_TRUE@am_libpam_passthru_plugin_la_rpath = -rpath \
+ at enable_pam_passthru_TRUE@	$(serverplugindir)
 libpassthru_plugin_la_LIBADD =
 am_libpassthru_plugin_la_OBJECTS =  \
 	ldap/servers/plugins/passthru/libpassthru_plugin_la-ptbind.lo \
@@ -877,6 +880,10 @@
 db_libdir = @db_libdir@
 db_libver = @db_libver@
 debug_defs = @debug_defs@
+enable_dna_FALSE = @enable_dna_FALSE@
+enable_dna_TRUE = @enable_dna_TRUE@
+enable_pam_passthru_FALSE = @enable_pam_passthru_FALSE@
+enable_pam_passthru_TRUE = @enable_pam_passthru_TRUE@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -979,13 +986,17 @@
 CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties
 taskdir = $(datadir)@scripttemplatedir@
 server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
+
+# this is how to add optional plugins
+ at enable_pam_passthru_TRUE@LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
+ at enable_dna_TRUE@LIBDNA_PLUGIN = libdna-plugin.la
 serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \
 	libback-ldbm.la libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la \
-	libdistrib-plugin.la libdna-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
-	libpam-passthru-plugin.la libpassthru-plugin.la libpresence-plugin.la \
+	libdistrib-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
+	libpassthru-plugin.la libpresence-plugin.la \
 	libpwdstorage-plugin.la libreferint-plugin.la libreplication-plugin.la \
 	libretrocl-plugin.la libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \
-	libviews-plugin.la
+	libviews-plugin.la $(LIBPAM_PASSTHRU_PLUGIN) $(LIBDNA_PLUGIN)
 
 nodist_property_DATA = ns-slapd.properties
 noinst_LIBRARIES = libavl.a libldaputil.a
@@ -2415,7 +2426,7 @@
 	ldap/servers/plugins/dna/$(am__dirstamp) \
 	ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp)
 libdna-plugin.la: $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_DEPENDENCIES) 
-	$(LINK) -rpath $(serverplugindir) $(libdna_plugin_la_LDFLAGS) $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_LIBADD) $(LIBS)
+	$(LINK) $(am_libdna_plugin_la_rpath) $(libdna_plugin_la_LDFLAGS) $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_LIBADD) $(LIBS)
 ldap/admin/lib/$(am__dirstamp):
 	@$(mkdir_p) ldap/admin/lib
 	@: > ldap/admin/lib/$(am__dirstamp)
@@ -2678,7 +2689,7 @@
 	ldap/servers/plugins/pam_passthru/$(am__dirstamp) \
 	ldap/servers/plugins/pam_passthru/$(DEPDIR)/$(am__dirstamp)
 libpam-passthru-plugin.la: $(libpam_passthru_plugin_la_OBJECTS) $(libpam_passthru_plugin_la_DEPENDENCIES) 
-	$(LINK) -rpath $(serverplugindir) $(libpam_passthru_plugin_la_LDFLAGS) $(libpam_passthru_plugin_la_OBJECTS) $(libpam_passthru_plugin_la_LIBADD) $(LIBS)
+	$(LINK) $(am_libpam_passthru_plugin_la_rpath) $(libpam_passthru_plugin_la_LDFLAGS) $(libpam_passthru_plugin_la_OBJECTS) $(libpam_passthru_plugin_la_LIBADD) $(LIBS)
 ldap/servers/plugins/passthru/$(am__dirstamp):
 	@$(mkdir_p) ldap/servers/plugins/passthru
 	@: > ldap/servers/plugins/passthru/$(am__dirstamp)


Index: config.h.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.h.in	19 Feb 2007 23:55:04 -0000	1.4
+++ config.h.in	22 Feb 2007 23:59:13 -0000	1.5
@@ -12,6 +12,15 @@
 /* cpu type sparc */
 #undef CPU_sparc
 
+/* enable the dna plugin */
+#undef ENABLE_DNA
+
+/* enable ldapi support in the server */
+#undef ENABLE_LDAPI
+
+/* enable the pam passthru auth plugin */
+#undef ENABLE_PAM_PASSTHRU
+
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 


Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure	19 Feb 2007 23:55:04 -0000	1.30
+++ configure	22 Feb 2007 23:59:13 -0000	1.31
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1038,8 +1038,14 @@
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-debug         Enable debug features
-  --enable-bundle      Enable bundled dependencies
+  --enable-debug          Enable debug features (default: no)
+  --enable-bundle         Enable bundled dependencies (default: no)
+  --enable-pam-passthru   enable the PAM passthrough auth plugin (default:
+                          yes)
+  --enable-dna            enable the Distributed Numeric Assignment (DNA)
+                          plugin (default: yes)
+  --enable-ldapi          enable LDAP over unix domain socket (LDAPI) support
+                          (default: yes)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1050,7 +1056,10 @@
   --with-tags[=TAGS]
                           include additional configurations [automatic]
   --with-fhs   Use FHS layout
-  --with-instconfigdir=/path   Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)
+  --with-instconfigdir=/path
+                          Base directory for instance specific writable
+                          configuration directories (default
+                          $sysconfdir/$PACKAGE_NAME)
   --with-nspr=PATH        Netscape Portable Runtime (NSPR) directory
   --with-nspr-inc=PATH        Netscape Portable Runtime (NSPR) include file directory
   --with-nspr-lib=PATH        Netscape Portable Runtime (NSPR) library directory
@@ -4299,7 +4308,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4302 "configure"' > conftest.$ac_ext
+  echo '#line 4311 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5434,7 +5443,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5437:" \
+echo "$as_me:5446:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6497,11 +6506,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6500: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6509: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6504: \$? = $ac_status" >&5
+   echo "$as_me:6513: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6765,11 +6774,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6768: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6777: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6772: \$? = $ac_status" >&5
+   echo "$as_me:6781: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6869,11 +6878,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6872: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6881: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6876: \$? = $ac_status" >&5
+   echo "$as_me:6885: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8338,7 +8347,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 8341 "configure"' > conftest.$ac_ext
+    echo '#line 8350 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9235,7 +9244,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9238 "configure"
+#line 9247 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9335,7 +9344,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9338 "configure"
+#line 9347 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11678,11 +11687,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11681: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11690: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11685: \$? = $ac_status" >&5
+   echo "$as_me:11694: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11782,11 +11791,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11785: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11794: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11789: \$? = $ac_status" >&5
+   echo "$as_me:11798: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12318,7 +12327,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 12321 "configure"' > conftest.$ac_ext
+    echo '#line 12330 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -13376,11 +13385,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13379: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13388: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13383: \$? = $ac_status" >&5
+   echo "$as_me:13392: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13480,11 +13489,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13483: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13492: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13487: \$? = $ac_status" >&5
+   echo "$as_me:13496: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14929,7 +14938,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 14932 "configure"' > conftest.$ac_ext
+    echo '#line 14941 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15707,11 +15716,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15710: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15719: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15714: \$? = $ac_status" >&5
+   echo "$as_me:15723: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15975,11 +15984,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15978: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15987: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15982: \$? = $ac_status" >&5
+   echo "$as_me:15991: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16079,11 +16088,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16082: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16091: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16086: \$? = $ac_status" >&5
+   echo "$as_me:16095: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17548,7 +17557,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17551 "configure"' > conftest.$ac_ext
+    echo '#line 17560 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -22906,6 +22915,97 @@
 fi
 
 
+# these enables are for optional or experimental features
+if test -z "$enable_pam_passthru" ; then
+   enable_pam_passthru=yes # if not set on cmdline, set default
+fi
+echo "$as_me:$LINENO: checking for --enable-pam-passthru" >&5
+echo $ECHO_N "checking for --enable-pam-passthru... $ECHO_C" >&6
+# Check whether --enable-pam-passthru or --disable-pam-passthru was given.
+if test "${enable_pam_passthru+set}" = set; then
+  enableval="$enable_pam_passthru"
+
+fi;
+if test "$enable_pam_passthru" = yes ; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_PAM_PASSTHRU 1
+_ACEOF
+
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test "$enable_pam_passthru" = "yes"; then
+  enable_pam_passthru_TRUE=
+  enable_pam_passthru_FALSE='#'
+else
+  enable_pam_passthru_TRUE='#'
+  enable_pam_passthru_FALSE=
+fi
+
+
+if test -z "$enable_dna" ; then
+   enable_dna=yes # if not set on cmdline, set default
+fi
+echo "$as_me:$LINENO: checking for --enable-dna" >&5
+echo $ECHO_N "checking for --enable-dna... $ECHO_C" >&6
+# Check whether --enable-dna or --disable-dna was given.
+if test "${enable_dna+set}" = set; then
+  enableval="$enable_dna"
+
+fi;
+if test "$enable_dna" = yes ; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_DNA 1
+_ACEOF
+
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test "$enable_dna" = "yes"; then
+  enable_dna_TRUE=
+  enable_dna_FALSE='#'
+else
+  enable_dna_TRUE='#'
+  enable_dna_FALSE=
+fi
+
+
+if test -z "$enable_ldapi" ; then
+   enable_ldapi=yes # if not set on cmdline, set default
+fi
+echo "$as_me:$LINENO: checking for --enable-ldapi" >&5
+echo $ECHO_N "checking for --enable-ldapi... $ECHO_C" >&6
+# Check whether --enable-ldapi or --disable-ldapi was given.
+if test "${enable_ldapi+set}" = set; then
+  enableval="$enable_ldapi"
+
+fi;
+if test "$enable_ldapi" = yes ; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_LDAPI 1
+_ACEOF
+
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# the default prefix - override with --prefix or --with-fhs
 
 
 # BEGIN COPYRIGHT BLOCK
@@ -22990,9 +23090,6 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for instconfigdir..." >&5
-echo "$as_me: checking for instconfigdir..." >&6;}
-
 # check for --with-instconfigdir
 echo "$as_me:$LINENO: checking for --with-instconfigdir" >&5
 echo $ECHO_N "checking for --with-instconfigdir... $ECHO_C" >&6
@@ -25107,6 +25204,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${enable_pam_passthru_TRUE}" && test -z "${enable_pam_passthru_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"enable_pam_passthru\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"enable_pam_passthru\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${enable_dna_TRUE}" && test -z "${enable_dna_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"enable_dna\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"enable_dna\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${WINNT_TRUE}" && test -z "${WINNT_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"WINNT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -25733,6 +25844,10 @@
 s, at debug_defs@,$debug_defs,;t t
 s, at BUNDLE_TRUE@,$BUNDLE_TRUE,;t t
 s, at BUNDLE_FALSE@,$BUNDLE_FALSE,;t t
+s, at enable_pam_passthru_TRUE@,$enable_pam_passthru_TRUE,;t t
+s, at enable_pam_passthru_FALSE@,$enable_pam_passthru_FALSE,;t t
+s, at enable_dna_TRUE@,$enable_dna_TRUE,;t t
+s, at enable_dna_FALSE@,$enable_dna_FALSE,;t t
 s, at configdir@,$configdir,;t t
 s, at sampledatadir@,$sampledatadir,;t t
 s, at propertydir@,$propertydir,;t t


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.ac	19 Feb 2007 23:55:04 -0000	1.21
+++ configure.ac	22 Feb 2007 23:59:13 -0000	1.22
@@ -51,7 +51,7 @@
 AC_CHECK_FUNCS([setrlimit endpwent ftruncate getcwd gethostbyname inet_ntoa localtime_r memmove memset mkdir munmap putenv rmdir socket strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset])
 
 AC_MSG_CHECKING(for --enable-debug)
-AC_ARG_ENABLE(debug, [  --enable-debug         Enable debug features],
+AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debug features (default: no)]),
 [
   AC_MSG_RESULT(yes)
   debug_defs="-DDEBUG -DMCC_DEBUG"
@@ -64,7 +64,7 @@
 
 # Used for legacy style packaging where we bundle all of the dependencies.
 AC_MSG_CHECKING(for --enable-bundle)
-AC_ARG_ENABLE(bundle, [  --enable-bundle      Enable bundled dependencies],
+AC_ARG_ENABLE(bundle, AS_HELP_STRING([--enable-bundle], [Enable bundled dependencies (default: no)]),
 [
   AC_MSG_RESULT(yes)
   bundle="1";
@@ -75,6 +75,52 @@
 ])
 AM_CONDITIONAL(BUNDLE,test "$bundle" = "1")
 
+# these enables are for optional or experimental features
+if test -z "$enable_pam_passthru" ; then
+   enable_pam_passthru=yes # if not set on cmdline, set default
+fi
+AC_MSG_CHECKING(for --enable-pam-passthru)
+AC_ARG_ENABLE(pam-passthru,
+        AS_HELP_STRING([--enable-pam-passthru],
+                       [enable the PAM passthrough auth plugin (default: yes)]))
+if test "$enable_pam_passthru" = yes ; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE([ENABLE_PAM_PASSTHRU], [1], [enable the pam passthru auth plugin])
+else
+  AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(enable_pam_passthru,test "$enable_pam_passthru" = "yes")
+
+if test -z "$enable_dna" ; then
+   enable_dna=yes # if not set on cmdline, set default
+fi
+AC_MSG_CHECKING(for --enable-dna)
+AC_ARG_ENABLE(dna,
+        AS_HELP_STRING([--enable-dna],
+                       [enable the Distributed Numeric Assignment (DNA) plugin (default: yes)]))
+if test "$enable_dna" = yes ; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE([ENABLE_DNA], [1], [enable the dna plugin])
+else
+  AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(enable_dna,test "$enable_dna" = "yes")
+
+if test -z "$enable_ldapi" ; then
+   enable_ldapi=yes # if not set on cmdline, set default
+fi
+AC_MSG_CHECKING(for --enable-ldapi)
+AC_ARG_ENABLE(ldapi,
+        AS_HELP_STRING([--enable-ldapi],
+                       [enable LDAP over unix domain socket (LDAPI) support (default: yes)]))
+if test "$enable_ldapi" = yes ; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE([ENABLE_LDAPI], [1], [enable ldapi support in the server])
+else
+  AC_MSG_RESULT(no)
+fi
+
+# the default prefix - override with --prefix or --with-fhs
 AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
 
 m4_include(m4/fhs.m4)
@@ -115,11 +161,11 @@
 AC_SUBST(serverplugindir)
 AC_SUBST(scripttemplatedir)
 
-AC_CHECKING(for instconfigdir)
-
 # check for --with-instconfigdir
 AC_MSG_CHECKING(for --with-instconfigdir)
-AC_ARG_WITH(instconfigdir, [  --with-instconfigdir=/path   Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)],
+AC_ARG_WITH(instconfigdir,
+        AS_HELP_STRING([--with-instconfigdir=/path],
+                       [Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)]),
 [
   if test $withval = yes ; then
      AC_ERROR([Please specify a full path with --with-instconfigdir])

















From fedora-directory-commits at redhat.com  Fri Feb 23 04:10:53 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 22 Feb 2007 23:10:53 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
	create_instance.c, 1.45, 1.46
Message-ID: <200702230410.l1N4ArsJ004962@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4944

Modified Files:
	create_instance.c 
Log Message:
Need to terminate dna plugin config entry with a newline



Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- create_instance.c	22 Feb 2007 23:59:13 -0000	1.45
+++ create_instance.c	23 Feb 2007 04:10:50 -0000	1.46
@@ -3236,6 +3236,7 @@
     fprintf(f, "nsslapd-plugintype: preoperation\n");
     fprintf(f, "nsslapd-pluginenabled: off\n");
     fprintf(f, "nsslapd-pluginPath: %s/libdna-plugin%s\n", cf->plugin_dir, shared_lib);
+    fprintf(f, "\n");
 #endif /* ENABLE_DNA */
 
     fprintf(f, "dn: cn=ldbm database,cn=plugins,cn=config\n");



From fedora-directory-commits at redhat.com  Fri Feb 23 18:40:30 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 23 Feb 2007 13:40:30 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
	create_instance.c, 1.46, 1.47
Message-ID: <200702231840.l1NIeU4a025244@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25228/ldapserver/ldap/admin/src

Modified Files:
	create_instance.c 
Log Message:
Resolves: bug 229825
Bug Description: aci with bogus uid= dn created by ds_newinst
Reviewed by: nhosoi (Thanks!)
Fix Description: Unknown to me until just now, PL_strdup(NULL) will return "" - the empty string.  The code in config_suitespot() expects that empty or unused fields are NULL.  The solution is to create a create_instance_strdup() wrapper around PL_strdup() and use that in cases where the argument may be NULL.  I checked create_instance.c.  Every other place where PL_strdup is used, the argument is checked for NULL first.  So these are the only places affected.  Instance creation works fine after this change and does not create the offending aci.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no 



Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- create_instance.c	23 Feb 2007 04:10:50 -0000	1.46
+++ create_instance.c	23 Feb 2007 18:40:27 -0000	1.47
@@ -338,6 +338,7 @@
 char *create_instance_concatenate(char *, char *, int);
 int create_instance_mkdir(char *, int);
 char *create_instance_mkdir_p(char *, char *, int, struct passwd *);
+static char *create_instance_strdup(const char *);
 
 #if defined( SOLARIS )
 /*
@@ -1311,6 +1312,16 @@
     return 1;
 }
 
+static char *create_instance_strdup(const char *s)
+{
+    char *result = NULL;
+    if (s) {
+        result = PL_strdup(s);
+    }
+
+    return result;
+}
+
 #if defined( SOLARIS )
 /*
  * Solaris 9+ specific installation
@@ -4063,23 +4074,23 @@
 
     memset( &query_vars, 0, sizeof(query_vars) );
     if (!cf->use_existing_user_ds)
-        query_vars.suffix = PL_strdup( cf->suffix );
-    query_vars.ssAdmID = PL_strdup( cf->cfg_sspt_uid );
-    query_vars.ssAdmPW1 = PL_strdup( cf->cfg_sspt_uidpw );
-    query_vars.ssAdmPW2 = PL_strdup( cf->cfg_sspt_uidpw );
-    query_vars.rootDN = PL_strdup( cf->rootdn ); 
-    query_vars.rootPW = PL_strdup( cf->rootpw );
-    query_vars.admin_domain = PL_strdup( cf->admin_domain );
-    query_vars.netscaperoot = PL_strdup( cf->netscaperoot );
-    query_vars.testconfig = PL_strdup( cf->testconfig );
-    query_vars.consumerDN = PL_strdup(cf->consumerdn);
-    query_vars.consumerPW = PL_strdup(cf->consumerhashedpw);
+        query_vars.suffix = create_instance_strdup( cf->suffix );
+    query_vars.ssAdmID = create_instance_strdup( cf->cfg_sspt_uid );
+    query_vars.ssAdmPW1 = create_instance_strdup( cf->cfg_sspt_uidpw );
+    query_vars.ssAdmPW2 = create_instance_strdup( cf->cfg_sspt_uidpw );
+    query_vars.rootDN = create_instance_strdup( cf->rootdn ); 
+    query_vars.rootPW = create_instance_strdup( cf->rootpw );
+    query_vars.admin_domain = create_instance_strdup( cf->admin_domain );
+    query_vars.netscaperoot = create_instance_strdup( cf->netscaperoot );
+    query_vars.testconfig = create_instance_strdup( cf->testconfig );
+    query_vars.consumerDN = create_instance_strdup(cf->consumerdn);
+    query_vars.consumerPW = create_instance_strdup(cf->consumerhashedpw);
     if (cf->cfg_sspt && !strcmp(cf->cfg_sspt, "1"))
         query_vars.cfg_sspt = 1;
     else
         query_vars.cfg_sspt = 0;
 
-    query_vars.config_admin_uid = PL_strdup(cf->cfg_sspt_uid);
+    query_vars.config_admin_uid = create_instance_strdup(cf->cfg_sspt_uid);
 
     memset(&slapd_conf, 0, sizeof(SLAPD_CONFIG));
     if (sroot)



From fedora-directory-commits at redhat.com  Fri Feb 23 19:40:54 2007
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 23 Feb 2007 14:40:54 -0500
Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.22,
	1.23 aclocal.m4, 1.22, 1.23 configure, 1.31, 1.32 missing,
	1.17, 1.18 install-sh, 1.17, 1.18 depcomp, 1.17, 1.18 compile,
	1.17, 1.18 config.sub, 1.16, 1.17 config.guess, 1.16,
	1.17 Makefile.in, 1.34, 1.35
Message-ID: <200702231940.l1NJesep030987@cvs-int.fedora.redhat.com>

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30858/ldapserver

Modified Files:
	configure.ac aclocal.m4 configure missing install-sh depcomp 
	compile config.sub config.guess Makefile.in 
Log Message:
Resolves: bug 229077
Bug Description: Rename fedora-ds to fedora-ds-base (The package breaks
an previous installation of the Fedora DS!!)
Reviewed by: nhosoi, dgilmore (Thanks!)
Fix Description: As it turns out, only the spec file will have to change.  It is ok that we have a package named pkgname-base that uses paths like /etc/pkgname and service pkgname.  So this diff has been revised to simply bump the version in the code to differentiate it from the previously withdrawn fedora-ds in Fedora Extras.
Platforms tested: RHEL4, FC6
Flag Day: No.
Doc impact: No. 



Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure.ac	22 Feb 2007 23:59:13 -0000	1.22
+++ configure.ac	23 Feb 2007 19:40:51 -0000	1.23
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
 # This version is the version returned by ns-slapd -v
-AC_INIT([fedora-ds], [1.1.0a1], [http://bugzilla.redhat.com/])
+AC_INIT([fedora-ds], [1.1.0a2], [http://bugzilla.redhat.com/])
 # AC_CONFIG_HEADER must be called right after AC_INIT.
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])




Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- configure	22 Feb 2007 23:59:13 -0000	1.31
+++ configure	23 Feb 2007 19:40:52 -0000	1.32
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a1.
+# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a2.
 #
 # Report bugs to <http://bugzilla.redhat.com/>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='fedora-ds'
 PACKAGE_TARNAME='fedora-ds'
-PACKAGE_VERSION='1.1.0a1'
-PACKAGE_STRING='fedora-ds 1.1.0a1'
+PACKAGE_VERSION='1.1.0a2'
+PACKAGE_STRING='fedora-ds 1.1.0a2'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
 
 # Factoring default headers for most tests.
@@ -954,7 +954,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures fedora-ds 1.1.0a1 to adapt to many kinds of systems.
+\`configure' configures fedora-ds 1.1.0a2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fedora-ds 1.1.0a1:";;
+     short | recursive ) echo "Configuration of fedora-ds 1.1.0a2:";;
    esac
   cat <<\_ACEOF
 
@@ -1197,7 +1197,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-fedora-ds configure 1.1.0a1
+fedora-ds configure 1.1.0a2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1211,7 +1211,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fedora-ds $as_me 1.1.0a1, which was
+It was created by fedora-ds $as_me 1.1.0a2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1857,7 +1857,7 @@
 
 # Define the identity of the package.
  PACKAGE='fedora-ds'
- VERSION='1.1.0a1'
+ VERSION='1.1.0a2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -25510,7 +25510,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by fedora-ds $as_me 1.1.0a1, which was
+This file was extended by fedora-ds $as_me 1.1.0a2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25573,7 +25573,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-fedora-ds config.status 1.1.0a1
+fedora-ds config.status 1.1.0a2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

















From fedora-directory-commits at redhat.com  Sat Feb 24 01:57:24 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 20:57:24 -0500
Subject: [Fedora-directory-commits] esc/src/app/daemon escd.cpp,1.2,1.3
Message-ID: <200702240157.l1O1vOlF030224@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/daemon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30207

Modified Files:
	escd.cpp 
Log Message:
Add time stamp to log messages.



Index: escd.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/daemon/escd.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- escd.cpp	25 Oct 2006 03:56:57 -0000	1.2
+++ escd.cpp	24 Feb 2007 01:57:21 -0000	1.3
@@ -50,20 +50,21 @@
 
 void ESC_D::cleanup()
 {
+    char tBuff[56];
     int already = 0;
     PR_Lock(mDataLock);
     already = commandAlreadyLaunched;
     PR_Unlock(mDataLock);
     if(already)
     {
-        PR_LOG( escDLog, PR_LOG_ERROR, ("Daemon: ! Command is already running. \n"));
+        PR_LOG( escDLog, PR_LOG_ERROR, ("%s Daemon: ! Command is already running. \n",GetTStamp(tBuff,56)));
     }
 
-    PR_LOG( escDLog, PR_LOG_ERROR, ("Daemon: Attempting to shut down. \n"));
+    PR_LOG( escDLog, PR_LOG_ERROR, ("%s Daemon: Attempting to shut down. \n",GetTStamp(tBuff,56)));
 
     CoolKeyShutdown();
 
-    PR_LOG( escDLog, PR_LOG_ERROR, ("Daemon: Past CoolKeyShutdown \n"));
+    PR_LOG( escDLog, PR_LOG_ERROR, ("%s Daemon: Past CoolKeyShutdown \n",GetTStamp(tBuff,56)));
 
     PR_DestroyLock(mDataLock);
 
@@ -73,13 +74,14 @@
 
 HRESULT ESC_D::init(int argc, char **argv)
 {
+    char tBuff[56];
     HRESULT result = S_OK;
 
-    PR_LOG( escDLog, PR_LOG_DEBUG, ("Daemon: Nmber of args! %d \n",argc));
+    PR_LOG( escDLog, PR_LOG_DEBUG, ("%s Daemon: Nmber of args! %d \n",GetTStamp(tBuff,56),argc));
 
 
     for(int i = 0; i < argc ; i++)
-        PR_LOG( escDLog, PR_LOG_DEBUG, ("Argv[%d]: %s \n",i,argv[i]));
+        PR_LOG( escDLog, PR_LOG_DEBUG, ("%s Argv[%d]: %s \n",GetTStamp(tBuff,56),i,argv[i]));
 
     if(argc != CORRECT_NUM_ARGS)
     {
@@ -89,7 +91,7 @@
      mDataLock = PR_NewLock();
      if (!mDataLock)
      {
-        PR_LOG( escDLog, PR_LOG_ERROR, ("Cannot create mutex for ESCD! \n"));
+        PR_LOG( escDLog, PR_LOG_ERROR, ("%s Cannot create mutex for ESCD! \n",GetTStamp(tBuff,56)));
         return E_FAIL;
      }
 
@@ -131,7 +133,7 @@
         {
             keyInsertedCommand = value; 
 
-            PR_LOG( escDLog, PR_LOG_DEBUG, ("Daemon: keyInsertedCommand: %s. \n",keyInsertedCommand.c_str()));
+            PR_LOG( escDLog, PR_LOG_DEBUG, ("%s Daemon: keyInsertedCommand: %s. \n",GetTStamp(tBuff,56),keyInsertedCommand.c_str()));
 
         }
     }
@@ -139,12 +141,12 @@
     vector<string>::iterator n1, v1;
     v1  =  arg2Tokens.begin();
    
-    PR_LOG(escDLog, PR_LOG_ALWAYS, ("Daemon: got v1 \n")); 
+    PR_LOG(escDLog, PR_LOG_ALWAYS, ("%s Daemon: got v1 \n",GetTStamp(tBuff,56))); 
 
     if(n1 != arg2Tokens.end())
     {
         n1  =  v1++;
-        PR_LOG(escDLog, PR_LOG_ALWAYS, ("Daemon: got n1... \n"));
+        PR_LOG(escDLog, PR_LOG_ALWAYS, ("%s Daemon: got n1... \n",GetTStamp(tBuff,56)));
         string name1 =  "";
         string value1 = "";
 
@@ -157,7 +159,7 @@
         if(name1 == ON_SIGNAL_CMD && value1.size())
         {
            onSignalCommand = value1;
-           PR_LOG( escDLog, PR_LOG_DEBUG, ("Daemon: onSignalCommand: %s. \n",onSignalCommand.c_str()));
+           PR_LOG( escDLog, PR_LOG_DEBUG, ("%s Daemon: onSignalCommand: %s. \n",GetTStamp(tBuff,56),onSignalCommand.c_str()));
         }
 
     }
@@ -196,12 +198,13 @@
         unsigned long data, const char *strData
     )
 {
+    char tBuff[56];
     HRESULT result = S_OK;
 
     if(keyState == eCKState_KeyInserted)
     {
 
-        PR_LOG( escDLog, PR_LOG_ALWAYS, ("Daemon: Key Inserted: keyID:  %s. \n",keyID));
+        PR_LOG( escDLog, PR_LOG_ALWAYS, ("%s Daemon: Key Inserted: keyID:  %s. \n",GetTStamp(tBuff,56),keyID));
 
         string fullCommand="";
         string space = " " ;
@@ -214,7 +217,7 @@
 
     if(keyState == eCKState_KeyRemoved)
     {
-        PR_LOG( escDLog, PR_LOG_ALWAYS, ("Daemon: Key Removed: keyID:  %s. \n",keyID));
+        PR_LOG( escDLog, PR_LOG_ALWAYS, ("%s Daemon: Key Removed: keyID:  %s. \n",GetTStamp(tBuff,56),keyID));
 
     }
 
@@ -252,9 +255,10 @@
 
 HRESULT ESC_D::launchCommand(string &command)
 {
+    char tBuff[56];
     const char *shell = SHELL;
 
-    PR_LOG( escDLog, PR_LOG_ALWAYS, ("Daemon: About to launch command:  %s. \n",command.c_str()));
+    PR_LOG( escDLog, PR_LOG_ALWAYS, ("%s Daemon: About to launch command:  %s. \n",GetTStamp(tBuff,56),command.c_str()));
 
     int already = 0;
 
@@ -267,7 +271,7 @@
 
     if(already)
     {
-        PR_LOG( escDLog, PR_LOG_DEBUG, ("Daemon: About to launch command: Command already running.. \n"))  ;
+        PR_LOG( escDLog, PR_LOG_DEBUG, ("%s Daemon: About to launch command: Command already running.. \n",GetTStamp(tBuff,56)))  ;
         return E_FAIL;
     }
 
@@ -303,7 +307,7 @@
 
      
     commandAlreadyLaunched = 0;
-    PR_LOG( escDLog, PR_LOG_DEBUG, ("Daemon: Child command has exited.. \n"))  ;
+    PR_LOG( escDLog, PR_LOG_DEBUG, ("%s Daemon: Child command has exited.. \n",GetTStamp(tBuff,56)))  ;
 
     PR_Unlock(mDataLock);
 
@@ -317,7 +321,8 @@
 int ESC_D::xIOErrorHandler(Display *display)
 {
 
-   PR_LOG( escDLog, PR_LOG_ALWAYS, ("Daemon: XIOErrorHandler! We are finished.\n"));
+   char tBuff[56];
+   PR_LOG( escDLog, PR_LOG_ALWAYS, ("%s Daemon: XIOErrorHandler! We are finished.\n",GetTStamp(tBuff,56)));
 
     if(single)
         single->cleanup();
@@ -328,11 +333,11 @@
 
 void ESC_D::signalHandler(int signal)
 {
-
+   char tBuff[56];
    string fullCommand="";
    string space = " " ;
 
-   PR_LOG( escDLog, PR_LOG_DEBUG, ("Daemon: signalHandler: signal: %d.. \n",signal));
+   PR_LOG( escDLog, PR_LOG_DEBUG, ("%s Daemon: signalHandler: signal: %d.. \n",GetTStamp(tBuff,56),signal));
 
    switch(signal)
    {
@@ -357,7 +362,7 @@
 
 int main(int argc, char **argv)
 {
-
+    char tBuff[56];
     pid_t pid;
 
     // Fork off the parent process        
@@ -369,7 +374,7 @@
         exit(0);
     }
 
-    PR_LOG(escDLog, PR_LOG_ALWAYS, ("Daemon: Initializing Daemon... \n"));
+    PR_LOG(escDLog, PR_LOG_ALWAYS, ("%s Daemon: Initializing Daemon... \n",GetTStamp(tBuff,56)));
 
     umask(0);
 
@@ -379,7 +384,7 @@
 
     if(result == E_FAIL)
     {
-        PR_LOG( escDLog, PR_LOG_ALWAYS, ("Daemon: Error initializing, exiting.. \n"));
+        PR_LOG( escDLog, PR_LOG_ALWAYS, ("%s Daemon: Error initializing, exiting.. \n",GetTStamp(tBuff,56)));
         exit(1);
     }
 
@@ -387,7 +392,7 @@
 
     if(hresult == E_FAIL)
     {
-        PR_LOG( escDLog, PR_LOG_ALWAYS, ("Daemon: Error initializing CoolKey System, this will result in problems recognizing Smart Cards! \n"));
+        PR_LOG( escDLog, PR_LOG_ALWAYS, ("%s Daemon: Error initializing CoolKey System, this will result in problems recognizing Smart Cards! \n",GetTStamp(tBuff,56)));
     }
 
 
@@ -400,13 +405,13 @@
 
     if(!display)
     {
-        PR_LOG( escDLog, PR_LOG_ALWAYS, ("Daemon: Error Obtaining X Display! \n"));
+        PR_LOG( escDLog, PR_LOG_ALWAYS, ("%s Daemon: Error Obtaining X Display! \n",GetTStamp(tBuff,56)));
     }
 
-    PR_LOG( escDLog, PR_LOG_ALWAYS, ("Daemon: Attempted XOpenDisplay: %p \n",display)); 
+    PR_LOG( escDLog, PR_LOG_ALWAYS, ("%s Daemon: Attempted XOpenDisplay: %p \n",GetTStamp(tBuff,56),display)); 
     while ("looping forever") XNextEvent(display,&event);
 
-    PR_LOG( escDLog, PR_LOG_ALWAYS, ("Daemon: main exiting.. \n")    );
+    PR_LOG( escDLog, PR_LOG_ALWAYS, ("%s Daemon: main exiting.. \n",GetTStamp(tBuff,56))    );
  
     XCloseDisplay (display);
  



From fedora-directory-commits at redhat.com  Sat Feb 24 01:58:32 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 20:58:32 -0500
Subject: [Fedora-directory-commits] esc/src/app/xpcom rhICoolKey.idl, 1.4,
	1.5
Message-ID: <200702240158.l1O1wW08030261@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30243

Modified Files:
	rhICoolKey.idl 
Log Message:
Add method to pass log message contents from script to be logged in the native code.



Index: rhICoolKey.idl
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhICoolKey.idl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rhICoolKey.idl	9 Feb 2007 21:37:33 -0000	1.4
+++ rhICoolKey.idl	24 Feb 2007 01:58:30 -0000	1.5
@@ -31,6 +31,8 @@
     void rhCoolKeySetNotifyCallback(in rhIKeyNotify jsNotify);
 
     void rhCoolKeyUnSetNotifyCallback(in rhIKeyNotify jsNotify);
+
+    void CoolKeyLogMsg(in unsigned long aLogLevel, in string aMessage);
     void BlinkCoolKey(in unsigned long aKeyType, in string aKeyID,in unsigned long aRate,in unsigned long aDuration);
 
 



From fedora-directory-commits at redhat.com  Sat Feb 24 01:59:52 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 20:59:52 -0500
Subject: [Fedora-directory-commits] esc/src/app/xpcom rhCoolKey.cpp,1.5,1.6
Message-ID: <200702240159.l1O1xqQd030346@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30317

Modified Files:
	rhCoolKey.cpp 
Log Message:
Add time stamp to log files and add method to issue log message from script.



Index: rhCoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhCoolKey.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rhCoolKey.cpp	9 Feb 2007 21:36:47 -0000	1.5
+++ rhCoolKey.cpp	24 Feb 2007 01:59:50 -0000	1.6
@@ -43,6 +43,7 @@
 #include "content/nsCopySupport.h"
 #include <vector>
 #include <string>
+#include <time.h>
 
 
 #define STRINGIFY(x) #x
@@ -90,7 +91,6 @@
 
 static PRLogModuleInfo *coolKeyLog = PR_NewLogModule("coolKey");
 
-
 rhCoolKey *single = NULL;
 
 class CoolKeyShutdownObserver : public nsIObserver
@@ -106,9 +106,8 @@
 
  CoolKeyShutdownObserver::~CoolKeyShutdownObserver()
  {
-     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyShutdownObserver::~CoolKeyShutdownObserver \n"));
-
-  
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyShutdownObserver::~CoolKeyShutdownObserver \n",GetTStamp(tBuff,56)));
  }
  
  NS_IMETHODIMP
@@ -116,26 +115,19 @@
                                  const char *aTopic,
                                  const PRUnichar *someData)
  {
-   if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
-   {
-
-         PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyShutdownObserver::Observe shutting down"));
-
-         if(single)
-         {
-             single->ShutDownInstance();
-
-         }
-
+     char tBuff[56];
+     if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
+     {
+         PR_LOG(coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyShutdownObserver::Observe shutting down",GetTStamp(tBuff,56)));
+        if(single)
+        {
+            single->ShutDownInstance();
+        }
 
    }
    return NS_OK;
  }
 
-
-
-
-
 unsigned int
 ASCCalcBase64DecodedLength(const char *aBase64Str)
 {
@@ -178,30 +170,30 @@
 rhCoolKey::rhCoolKey()
 :mJsNotify(nsnull),mProxy(nsnull)
 {
-       PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::rhCoolKey: %p \n",this));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::rhCoolKey: %p \n",GetTStamp(tBuff,56),this));
+
+    if(!single)
+    {
+        single = this;
+
+    }
+    else
+    {
+        return;
+    }
+
+    #ifdef XP_WIN32 
+        mCSPListener = nsnull;
+    #endif
 
-       if(!single)
-       {
-           single = this;
-
-       }
-       else
-       {
-           return;
-       }
-
-       #ifdef XP_WIN32 
-           mCSPListener = nsnull;
-       #endif
-
-       PRBool res = InitInstance();
-
-       if(res == PR_FALSE)
-       {
-            PR_LOG( coolKeyLog, PR_LOG_ERROR, ("ESC InitInstance failed,exiting. CoolKey instance %p\n",coolKey_instance));
+    PRBool res = InitInstance();
 
-            exit(1);
-       }
+    if(res == PR_FALSE)
+    {
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s ESC InitInstance failed,exiting. CoolKey instance %p\n",GetTStamp(tBuff,56),coolKey_instance));
+        exit(1);
+     }
 
   /* member initializers and constructor code */ 
 }
@@ -210,17 +202,18 @@
 {
    /* destructor code */
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::~rhCoolKey: %p \n",this));
-
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::~rhCoolKey: %p \n",GetTStamp(tBuff,56),this));
 }
 
 void rhCoolKey::ShutDownInstance()
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::ShutDownInstance. %p \n",this));    
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::ShutDownInstance. %p \n",GetTStamp(tBuff,56),this));    
 
     if (mProxy)
     {
-       PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::ShutDownInstance: About to dereference Proxy Object. Proxy %p \n",mProxy));
+       PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::ShutDownInstance: About to dereference Proxy Object. Proxy %p \n",GetTStamp(tBuff,56),mProxy));
 
        CoolKeyUnregisterListener(mProxy);
 
@@ -291,17 +284,13 @@
 
 }          
 
-
-
 const char *rhCoolKey::doGetCoolKeyConfigValue(const char *aName )
 {
-
     if(!aName)
     {
         return NULL;
     }
 
-
     nsCOMPtr<nsIPrefBranch> pref;
     char * prefValue = NULL;;
     pref = do_GetService("@mozilla.org/preferences-service;1");
@@ -311,30 +300,25 @@
         return NULL;
     }
 
-
     pref->GetCharPref(aName, &prefValue);
 
-
     return (const char *) prefValue;
-
-
 }
 
 
 PRBool rhCoolKey::InitInstance()
 {
+    char tBuff[56];
     PRBool ret = PR_TRUE;
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::InitInstance %p \n",this));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::InitInstance %p \n",GetTStamp(tBuff,56),this));
 
     char *path = (char *) GRE_GetXPCOMPath();
 
-     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GREPath %s \n",path));
+     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GREPath %s \n",GetTStamp(tBuff,56),path));
 
     char xpcom_path[512];
 
-
-
     char *lib_name = XPCOM_LIB_NAME ;
 
 #ifdef XP_WIN32
@@ -344,15 +328,13 @@
     sprintf(xpcom_path,"%s/%s",path,lib_name);
 #endif
   
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::xpcom_path %s \n",xpcom_path)); 
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::xpcom_path %s \n",GetTStamp(tBuff,56),xpcom_path)); 
 
     XPCOMGlueStartup(xpcom_path);
 
     nssComponent
     = do_GetService(PSM_COMPONENT_CONTRACTID); 
 
-
-
     CoolKeySetCallbacks(Dispatch,Reference, Release,doGetCoolKeyConfigValue ,doSetCoolKeyConfigValue);
 
     mProxy = CreateProxyObject();
@@ -360,14 +342,12 @@
     if(mProxy)
     {
         CoolKeyRegisterListener(mProxy);
-
     }
     else
     {
-        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Can't create Proxy Object for ESC. \n"));
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Can't create Proxy Object for ESC. \n",GetTStamp(tBuff,56)));
     }
 
-
 #ifdef XP_WIN32
 
      const char *doCapi = NULL;
@@ -381,7 +361,6 @@
          if(mCSPListener)
          {
              AddNotifyKeyListener(mCSPListener);
-
          }
 
      }
@@ -420,7 +399,7 @@
  
      observerService->AddObserver(observer, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
    } else {
-     PR_LOG(coolKeyLog,PR_LOG_ERROR,("Could not get an observer service.  We will leak on shutdown."));
+     PR_LOG(coolKeyLog,PR_LOG_ERROR,("%s Could not get an observer service.  We will leak on shutdown.",GetTStamp(tBuff,56)));
    }
 
   return ret;
@@ -429,10 +408,10 @@
 
 rhICoolKey* rhCoolKey::CreateProxyObject()
 {
-
+    char tBuff[56];
     rhICoolKey *proxyObject = NULL;
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::CreateProxyObject: \n"));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::CreateProxyObject: \n",GetTStamp(tBuff,56)));
 
     nsCOMPtr<nsIProxyObjectManager> manager =
             do_GetService(NS_XPCOMPROXY_CONTRACTID);
@@ -442,7 +421,7 @@
 
     manager->GetProxyForObject(NS_UI_THREAD_EVENTQ, NS_GET_IID(rhICoolKey), this, PROXY_SYNC | PROXY_ALWAYS, (void**)&proxyObject);
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::CreateProxyObject: original: %p proxy %p  \n",this,proxyObject));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::CreateProxyObject: original: %p proxy %p  \n",GetTStamp(tBuff,56),this,proxyObject));
 
     return proxyObject;
    
@@ -450,36 +429,36 @@
 
 CoolKeyNode* rhCoolKey::GetCoolKeyInfo(unsigned long aKeyType, const char * aKeyID)
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyInfo: gASCAvailableKeys %p looking for key %s type %d \n",GetTStamp(tBuff,56),&gASCAvailableKeys,aKeyID,aKeyType));
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyInfo: gASCAvailableKeys %p looking for key %s type %d \n",&gASCAvailableKeys,aKeyID,aKeyType));
-
-  std::list<CoolKeyNode*>::const_iterator it;
-  for(it=gASCAvailableKeys.begin(); it!=gASCAvailableKeys.end(); ++it) {
+    std::list<CoolKeyNode*>::const_iterator it;
+    for(it=gASCAvailableKeys.begin(); it!=gASCAvailableKeys.end(); ++it) {
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyInfo: current key %s type %d, looking for key %s type %d \n",(*it)->mKeyID.get(),(*it)->mKeyType,aKeyID,aKeyType));
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyInfo: current key %s type %d, looking for key %s type %d \n",GetTStamp(tBuff,56),(*it)->mKeyID.get(),(*it)->mKeyType,aKeyID,aKeyType));
 
-    if ((*it)->mKeyType == aKeyType && !strcmp((*it)->mKeyID.get(), aKeyID))
-      return *it;
-  }
+        if ((*it)->mKeyType == aKeyType && !strcmp((*it)->mKeyID.get(), aKeyID))
+            return *it;
+    }
 
-  return 0;
+    return 0;
 }
 
 // Internal methods
 
 PRBool rhCoolKey::ASCCoolKeyIsAvailable(unsigned long aKeyType, char * aKeyID)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::ASCCoolKeyIsAvailable type %d id %s \n",aKeyType,aKeyID));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::ASCCoolKeyIsAvailable type %d id %s \n",GetTStamp(tBuff,56),aKeyType,aKeyID));
     return GetCoolKeyInfo(aKeyType, aKeyID) ? PR_TRUE : PR_FALSE;
 }
 
-
 HRESULT  rhCoolKey::ASCGetAvailableCoolKeyAt(unsigned long aIndex,
                                            unsigned long *aKeyType,
                                            nsEmbedCString *aKeyID)
 {
-   
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::ASCGetAvailableCoolKeyAt: index %d type %d id %s \n",aIndex,aKeyType,aKeyID)); 
+    char tBuff[56]; 
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::ASCGetAvailableCoolKeyAt: index %d type %d id %s \n",GetTStamp(tBuff,56),aIndex,aKeyType,aKeyID)); 
     if (!aKeyType || !aKeyID)
         return E_FAIL;
 
@@ -504,9 +483,9 @@
 
 int   rhCoolKey::ASCGetNumAvailableCoolKeys(void)
 {
-
+    char tBuff[56];
     int size = (int) gASCAvailableKeys.size();
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::ASCGetNumAvailableCoolKeys %d \n",size));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::ASCGetNumAvailableCoolKeys %d \n",GetTStamp(tBuff,56),size));
     return size;
 
 }
@@ -519,52 +498,49 @@
 
 rhIKeyNotify* rhCoolKey::GetNotifyKeyListener(rhIKeyNotify *listener){
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetNotifyKeyListener: %p size %d \n",listener,gNotifyListeners.size() ));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetNotifyKeyListener: %p size %d \n",GetTStamp(tBuff,56),listener,gNotifyListeners.size() ));
 
-  std::list<nsCOMPtr<rhIKeyNotify> >::const_iterator it;
-  for(it=gNotifyListeners.begin(); it!=gNotifyListeners.end(); ++it) {
+    std::list<nsCOMPtr<rhIKeyNotify> >::const_iterator it;
+    for(it=gNotifyListeners.begin(); it!=gNotifyListeners.end(); ++it) {
 
-      PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetNotifyKeyListener:  cur %p looking for %p \n",(*it).get(),listener));
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetNotifyKeyListener:  cur %p looking for %p \n",GetTStamp(tBuff,56),(*it).get(),listener));
 
-      if((*it) == listener)
-      {
-          PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetNotifyKeyListener:   looking for %p returning %p \n",listener,(*it).get()));
-          return (*it);
-      }
-  }
+        if((*it) == listener)
+        {
+            PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetNotifyKeyListener:   looking for %p returning %p \n",GetTStamp(tBuff,56),listener,(*it).get()));
+            return (*it);
+        }
+    }
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetNotifyKeyListener:  looking for %p returning NULL. \n",listener));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetNotifyKeyListener:  looking for %p returning NULL. \n",GetTStamp(tBuff,56),listener));
 
   return nsnull;
 }
 
-
 void rhCoolKey::AddNotifyKeyListener(rhIKeyNotify *listener)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::AddNotifyKeyListener: %p \n",listener));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::AddNotifyKeyListener: %p \n",GetTStamp(tBuff,56),listener));
 
     if(GetNotifyKeyListener(listener ))
     {
+         PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::AddNotifyKeyListener: %p listener already in list. \n",GetTStamp(tBuff,56),listener));
 
-         PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::AddNotifyKeyListener: %p listener already in list. \n",listener));
-
-         
          return ;
-
     }
 
     gNotifyListeners.push_back(listener);
-
 }
 
 void rhCoolKey::RemoveNotifyKeyListener(rhIKeyNotify *listener)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RemoveNotifyKeyListener: %p \n",listener));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RemoveNotifyKeyListener: %p \n",GetTStamp(tBuff,56),listener));
 
     if(!GetNotifyKeyListener(listener ))
     { 
-
-        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RemoveNotifyKeyListener: %p trying to remove listener not in list \n",listener));
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RemoveNotifyKeyListener: %p trying to remove listener not in list \n",GetTStamp(tBuff,56),listener));
 
         return ;
     }
@@ -576,7 +552,8 @@
 
 void rhCoolKey::ClearNotifyKeyList()
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::ClearNotifyKeyList: \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::ClearNotifyKeyList: \n",GetTStamp(tBuff,56)));
 
     while (gNotifyListeners.size() > 0) {
         rhIKeyNotify * node = (gNotifyListeners.front()).get();
@@ -590,34 +567,31 @@
 
 void rhCoolKey::InsertKeyIntoAvailableList(unsigned long aKeyType, const char * aKeyID,CoolKeyStatus aStatus)
 {
-
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::InsertKeyIntoAvailableList: \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::InsertKeyIntoAvailableList: \n",GetTStamp(tBuff,56)));
     if (ASCCoolKeyIsAvailable(aKeyType, (char *)aKeyID))
     {
-         PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::InsertKeyIntoAvailableList: Key Not Available \n"));
+         PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::InsertKeyIntoAvailableList: Key Not Available \n",GetTStamp(tBuff,56)));
 
         return;
-
     }
 
-
     CoolKeyNode *node = new CoolKeyNode(aKeyType, aKeyID, aStatus);
 
     if (!node)
     {
-        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Can't create new  CoolKey Data Structure. \n"));
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Can't create new  CoolKey Data Structure. \n",GetTStamp(tBuff,56)));
         return;
     }
 
-
     gASCAvailableKeys.push_back(node);
 
 }
 
 void rhCoolKey::RemoveKeyFromAvailableList(unsigned long aKeyType, const char * aKeyID)
 {
-
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RemoveKeyFromAvailableList type %d id %s \n",aKeyType,aKeyID));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RemoveKeyFromAvailableList type %d id %s \n",GetTStamp(tBuff,56),aKeyType,aKeyID));
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
     if (!node)
@@ -629,7 +603,8 @@
 
 void rhCoolKey::ClearAvailableList()
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::ClearAvailableList \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::ClearAvailableList \n",GetTStamp(tBuff,56)));
     while (gASCAvailableKeys.size() > 0) {
         CoolKeyNode *node = gASCAvailableKeys.front();
         delete node;
@@ -639,28 +614,29 @@
 
 HRESULT rhCoolKey::ASCSetCoolKeyPin(unsigned long aKeyType, const char * aKeyID, const char * aPin)
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::ASCSetCoolKeyPin type %d id %s pin %s \n",aKeyType,aKeyID,aPin));
-  CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
-  if (!node)
-    return E_FAIL;
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::ASCSetCoolKeyPin type %d id %s pin %s \n",GetTStamp(tBuff,56),aKeyType,aKeyID,aPin));
+    CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
+    if (!node)
+        return E_FAIL;
 
-  node->mPin = aPin;
-  return S_OK;
+    node->mPin = aPin;
+    return S_OK;
 }
 
 // Interface method implementations
 
 NS_IMETHODIMP rhCoolKey::RhNotifyKeyStateChange(PRUint32 aKeyType,const char *aKeyID, PRUint32 aKeyState, PRUint32 aData,const char* strData)
 {
-
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhNotifyKeyStateChange: id: %s type: %d state %d data: %d \n",aKeyID,aKeyType, aKeyState,aData));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhNotifyKeyStateChange: id: %s type: %d state %d data: %d \n",GetTStamp(tBuff,56),aKeyID,aKeyType, aKeyState,aData));
 
     CoolKeyNode tempKey(aKeyType, aKeyID,(CoolKeyStatus) aKeyState);
     CoolKeyNode *node = NULL;
 
     AutoCoolKey key(aKeyType, aKeyID);
 
-     switch (aKeyState)
+    switch (aKeyState)
     {
         case eCKState_KeyInserted:
         {
@@ -671,14 +647,14 @@
             if (CoolKeyIsEnrolled(&key))
                 keyStatus = eAKS_Available;       else if (CoolKeyHasApplet(&key))                keyStatus = eAKS_Uninitialized;
 
-              PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Key Inserted. ID %s \n",aKeyID));
-              InsertKeyIntoAvailableList(tempKey.mKeyType,aKeyID ,(CoolKeyStatus) keyStatus);
+             PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s Key Inserted. ID %s \n",GetTStamp(tBuff,56),aKeyID));
+             InsertKeyIntoAvailableList(tempKey.mKeyType,aKeyID ,(CoolKeyStatus) keyStatus);
           break;
         }
         case eCKState_KeyRemoved:
-          PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Key Removed. ID %s \n",aKeyID));
-          RemoveKeyFromAvailableList(tempKey.mKeyType, aKeyID);
-          break;
+            PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s Key Removed. ID %s \n",GetTStamp(tBuff,56),aKeyID));
+            RemoveKeyFromAvailableList(tempKey.mKeyType, aKeyID);
+        break;
         case eCKState_EnrollmentComplete:
         case eCKState_EnrollmentError:
         case eCKState_PINResetComplete:
@@ -688,8 +664,7 @@
         case eCKState_BlinkComplete:
         case eCKState_BlinkError:
         case eCKState_OperationCancelled:
-{
-
+        {
           node = GetCoolKeyInfo(tempKey.mKeyType, aKeyID);
 
           if (node) {
@@ -700,7 +675,7 @@
               node->mStatus = eAKS_Uninitialized;
            }
           break;
-        }
+         }
         case eCKState_EnrollmentStart:
         case eCKState_PINResetStart:
         case eCKState_FormatStart:
@@ -716,8 +691,7 @@
 
           ((rhIKeyNotify *) (*it))->RhNotifyKeyStateChange(aKeyType,aKeyID,aKeyState,aData,strData);
            
-          PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhNotifyKeyStateChange after call to RhNotifyKeyStateChange listener: %p",(*it).get()));
-
+          PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhNotifyKeyStateChange after call to RhNotifyKeyStateChange listener: %p",GetTStamp(tBuff,56),(*it).get()));
 
      }
 
@@ -726,26 +700,25 @@
 
 NS_IMETHODIMP rhCoolKey::RhCoolKeyUnSetNotifyCallback(rhIKeyNotify *jsNotify)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhCoolKeyUnSetNotifyCallback Object: input %p  this %p \n",jsNotify,this));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhCoolKeyUnSetNotifyCallback Object: input %p  this %p \n",GetTStamp(tBuff,56),jsNotify,this));
 
     RemoveNotifyKeyListener(jsNotify);
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhCoolKeyUnSetNotifyCallback Object: removed listener, size now %d \n",GetNotifyKeyListenerListSize()));
-
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhCoolKeyUnSetNotifyCallback Object: removed listener, size now %d \n",GetTStamp(tBuff,56),GetNotifyKeyListenerListSize()));
 
    if(GetNotifyKeyListenerListSize() == 0)
    {
-       PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhCoolKeyUnSetNotifyCallback Object: input %p  this %p Listener size 0. \n",jsNotify,this));
-
+       PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhCoolKeyUnSetNotifyCallback Object: input %p  this %p Listener size 0. \n",GetTStamp(tBuff,56),jsNotify,this));
    }
 
-    return NS_OK;
+   return NS_OK;
  }
 
 NS_IMETHODIMP rhCoolKey::RhCoolKeySetNotifyCallback(rhIKeyNotify *jsNotify)
 {
-
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhCoolKeySetNotifyCallback Object: %p this %p\n",jsNotify,this));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhCoolKeySetNotifyCallback Object: %p this %p\n",GetTStamp(tBuff,56),jsNotify,this));
 
     AddNotifyKeyListener(jsNotify);    
 
@@ -753,16 +726,29 @@
 
 }
 
-NS_IMETHODIMP rhCoolKey::BlinkCoolKey(PRUint32 aKeyType, const char *aKeyID, PRUint32 aRate, PRUint32 aDuration)
+/* void CoolKeyLogMsg (in unsigned long aLogLevel, in string aMessage); */
+NS_IMETHODIMP rhCoolKey::CoolKeyLogMsg(PRUint32 aLogLevel, const char *aMessage)
 {
+    char tBuff[56];
 
-   PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhBlinkCoolKey thread: %p \n",PR_GetCurrentThread()));
+    if(aMessage && ((PRLogModuleLevel) aLogLevel >=  PR_LOG_NONE && aLogLevel <= PR_LOG_MAX))
+    {
+        PR_LOG( coolKeyLog, (PRLogModuleLevel) aLogLevel, ("%s %s",GetTStamp(tBuff,56),aMessage));    
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP rhCoolKey::BlinkCoolKey(PRUint32 aKeyType, const char *aKeyID, PRUint32 aRate, PRUint32 aDuration)
+{
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhBlinkCoolKey thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
 
    CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
   if (!node)
   {
-      PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhBlinkCoolKey: GetCoolKeyInfo failed. \n"));
+      PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhBlinkCoolKey: GetCoolKeyInfo failed. \n",GetTStamp(tBuff,56)));
       return NS_ERROR_FAILURE;
   }
 
@@ -789,7 +775,8 @@
 NS_IMETHODIMP rhCoolKey::EnrollCoolKey(PRUint32 aKeyType, const char *aKeyID, const char *aEnrollmentType, const char *aScreenName, const char *aPin, const char *aScreenNamePWord, const char *aTokenCode)
 {
 
-    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Attempting to Enroll Key ,ID: %s \n",aKeyID));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("%s Attempting to Enroll Key ,ID: %s \n",GetTStamp(tBuff,56),aKeyID));
     
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
@@ -806,7 +793,6 @@
     AutoCoolKey key(aKeyType, aKeyID);
     HRESULT hres = CoolKeyEnrollToken(&key, aEnrollmentType, aScreenName, aPin,aScreenNamePWord,aTokenCode);
 
-
     if (hres == S_OK)
     {
         node->mStatus = eAKS_EnrollmentInProgress;
@@ -821,14 +807,14 @@
 
 NS_IMETHODIMP rhCoolKey::ResetCoolKeyPIN(PRUint32 aKeyType, const char *aKeyID, const char *aScreenName, const char *aPIN, const char *aScreenNamePwd)
 {
-    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Attempting to Reset Key PIN, ID: %s \n",aKeyID));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("%s Attempting to Reset Key PIN, ID: %s \n",GetTStamp(tBuff,56),aKeyID));
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
     if (!node)
     {
-        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhResetCoolKeyPIN no node: thread: %p \n",PR_GetCurrentThread()));
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhResetCoolKeyPIN no node: thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
         return NS_ERROR_FAILURE;
-
     }
 
   // Prevent multiple windows from trying to reset the pin for the same
@@ -842,16 +828,14 @@
 
     if (node->mStatus != eAKS_Available)
     {
-        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhResetCoolKeyPIN thread: token unavailable %p \n",PR_GetCurrentThread()));
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhResetCoolKeyPIN thread: token unavailable %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
         return NS_ERROR_FAILURE;
-
     }
 
     AutoCoolKey key(aKeyType, aKeyID);
 
     HRESULT hres = CoolKeyResetTokenPIN(&key, aScreenName, aPIN,aScreenNamePwd);
 
-
     if (hres == S_OK) 
     {
         node->mStatus = eAKS_PINResetInProgress;
@@ -865,7 +849,8 @@
 
 NS_IMETHODIMP rhCoolKey::RenewCoolKey(PRUint32 aKeyType, const char *aKeyID)
 {
-    PR_LOG( coolKeyLog, PR_LOG_ERROR, ("rhCoolKey::RhRenewCoolKey (not implemented) thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s rhCoolKey::RhRenewCoolKey (not implemented) thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
@@ -873,8 +858,8 @@
 
 NS_IMETHODIMP rhCoolKey::FormatCoolKey(PRUint32 aKeyType, const char *aKeyID, const char *aEnrollmentType, const char *aScreenName, const char *aPIN, const char *aScreenNamePWord, const char *aTokenCode)
 {
-
-    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Attempting to Format Key, ID: %s. ",aKeyID));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("%s Attempting to Format Key, ID: %s. ",GetTStamp(tBuff,56),aKeyID));
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
     if (!node)
@@ -916,14 +901,13 @@
 
 NS_IMETHODIMP rhCoolKey::CancelCoolKeyOperation(PRUint32 aKeyType, const char *aKeyID)
 {
-
+    char tBuff[56];
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
     if (!node)
         return NS_ERROR_FAILURE;
 
-
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhCancelCoolKeyOperation type %d id %s status %d: \n",aKeyType,aKeyID,node->mStatus));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhCancelCoolKeyOperation type %d id %s status %d: \n",GetTStamp(tBuff,56),aKeyType,aKeyID,node->mStatus));
 
   // If the key isn't busy, then there's nothing to do.
 
@@ -948,7 +932,7 @@
 /* void GetCoolKeyCertNicknames (in unsigned long aKeyType, in string aKeyID, out PRUint32 count, [array, size_is (count), retval] out string str); */
 NS_IMETHODIMP rhCoolKey::GetCoolKeyCertNicknames(PRUint32 aKeyType, const char *aKeyID, PRUint32 *count, char ***str)
 {
-
+    char tBuff[56];
     if(!aKeyID || !count)
     {
         return NS_ERROR_FAILURE;
@@ -962,13 +946,11 @@
     if(res != S_OK)
     {
         return NS_OK;    
-
     }
 
     char **array = NULL;
     int num = nicknames.size();
 
-
     array = (char **) nsMemory::Alloc((sizeof(char *) *num));
 
     if(!array)
@@ -982,7 +964,7 @@
     {
         char *tName = (char *) (*i).c_str();
 
-        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyCertNicknames  name %s  \n",tName));
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyCertNicknames  name %s  \n",GetTStamp(tBuff,56),tName));
 
         array[j] = NULL;
         if(tName)
@@ -1004,8 +986,8 @@
 
 NS_IMETHODIMP rhCoolKey::GetAvailableCoolKeys(PRUint32 *count, char ***str)
 {
-
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhGetAvailableCoolKeys thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhGetAvailableCoolKeys thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
 
     if(!count || !str)
     {
@@ -1016,7 +998,7 @@
 
     long numKeys = ASCGetNumAvailableCoolKeys();
 
-    PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Attempting to get number of keys. Value:  %d \n",numKeys));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s Attempting to get number of keys. Value:  %d \n",GetTStamp(tBuff,56),numKeys));
 
     if(numKeys == 0)
     {
@@ -1065,7 +1047,8 @@
 
 NS_IMETHODIMP rhCoolKey::GetCoolKeyStatus(PRUint32 aKeyType, const char *aKeyID, PRUint32 *_retval)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhGetCoolKeyStatus thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56]; 
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhGetCoolKeyStatus thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
     if(node)
@@ -1075,10 +1058,9 @@
     else
     {
         *_retval = eAKS_Unavailable;
-
     }
     
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhGetCoolKeyStatus retval: %d \n",*_retval));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhGetCoolKeyStatus retval: %d \n",GetTStamp(tBuff,56),*_retval));
 
     return NS_OK;
 }
@@ -1089,13 +1071,14 @@
 
 NS_IMETHODIMP rhCoolKey::GetCoolKeyIsReallyCoolKey(PRUint32 aKeyType, const char *aKeyID, PRBool *_retval)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyIsReallyCoolKey thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyIsReallyCoolKey thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
 
     if (ASCCoolKeyIsAvailable(aKeyType, (char *) aKeyID)) {
         if (aKeyID) {
             AutoCoolKey key(aKeyType, aKeyID);
             PRBool isCool = CoolKeyIsReallyCoolKey(&key);
-            PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyIsReallyCoolKey isCool: %d \n",(int) isCool));
+            PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyIsReallyCoolKey isCool: %d \n",GetTStamp(tBuff,56),(int) isCool));
             *_retval= isCool;
             return NS_OK;
         }
@@ -1107,8 +1090,8 @@
 /* long GetCoolKeyGetAppletVer (in unsigned long aKeyType, in string aKeyID, in boolean aIsMajor); */
 NS_IMETHODIMP rhCoolKey::GetCoolKeyGetAppletVer(PRUint32 aKeyType, const char *aKeyID, PRBool aIsMajor, PRInt32 *_retval)
 {
-
-    PR_LOG(coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyAppletVer thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56];
+    PR_LOG(coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyAppletVer thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
 
     AutoCoolKey key(aKeyType, aKeyID);
 
@@ -1117,15 +1100,14 @@
     *_retval = ver;
 
     return S_OK;
-
 }
 
 /* boolean rhCoolKeyIsEnrolled (in unsigned long aKeyType, in string aKeyID); */
 
 NS_IMETHODIMP rhCoolKey::GetCoolKeyIsEnrolled(PRUint32 aKeyType, const char *aKeyID, PRBool *_retval)
 {
-
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhCoolKeyIsEnrolled thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhCoolKeyIsEnrolled thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
     if (ASCCoolKeyIsAvailable(aKeyType, (char *) aKeyID)) {
 
     if (aKeyID) {
@@ -1144,16 +1126,14 @@
 /* string GetCoolKeyCertInfo (in unsigned long aKeyType, in string aKeyID, in string aCertNickname); */   
 NS_IMETHODIMP rhCoolKey::GetCoolKeyCertInfo(PRUint32 aKeyType, const char *aKeyID, const char *aCertNickname, char **aCertInfo)
 {
-
+    char tBuff[56];
     string certInfo = "";
     *aCertInfo = NULL;
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyCertInfo thread: %p \n",PR_GetCurrentThread()));
-
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyCertInfo thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
 
     AutoCoolKey key(aKeyType, aKeyID);
 
-
     HRESULT res =  CoolKeyGetCertInfo(&key,(char *) aCertNickname, certInfo);
 
     if(res == S_OK)
@@ -1169,12 +1149,13 @@
 
 /* string GetCoolKeyATR (in unsigned long aKeyType, in string aKeyID); */
   NS_IMETHODIMP rhCoolKey::GetCoolKeyATR(PRUint32 aKeyType, const char *aKeyID, char **_retval)
-  {
-     *_retval  = NULL;
+{
+    char tBuff[56];
+    *_retval  = NULL;
     AutoCoolKey key(aKeyType, aKeyID);
     char atr[128];
     HRESULT res =   CoolKeyGetATR(&key, (char *)&atr,sizeof(atr));
-     PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Attempting to get the key's ATR: Key: %s, ATR  %s. \n",aKeyID, (char *) atr));
+     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s Attempting to get the key's ATR: Key: %s, ATR  %s. \n",GetTStamp(tBuff,56),aKeyID, (char *) atr));
     if(res == S_OK)
     {
         char *temp =  (char *) nsMemory::Clone(atr,sizeof(char) * strlen((char *)atr) + 1);
@@ -1184,8 +1165,8 @@
   }
 
 /* string GetCoolKeyIssuerInfo (in unsigned long aKeyType, in string aKeyID); */  NS_IMETHODIMP rhCoolKey::GetCoolKeyIssuerInfo(PRUint32 aKeyType, const char *aKeyID, char **_retval)
-  {
-
+{
+    char tBuff[56];
     *_retval  = NULL;
 
     AutoCoolKey key(aKeyType, aKeyID);
@@ -1194,7 +1175,7 @@
 
     HRESULT res =  CoolKeyGetIssuerInfo(&key, (char *)&issuerInfo,256);
 
-     PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("Attempting to get the key's Issuer: Key: %s, Issuer  %s. \n",aKeyID, (char *) issuerInfo));
+     PR_LOG( coolKeyLog, PR_LOG_ALWAYS, ("%s Attempting to get the key's Issuer: Key: %s, Issuer  %s. \n",GetTStamp(tBuff,56),aKeyID, (char *) issuerInfo));
 
     if(res == S_OK)
     {
@@ -1204,14 +1185,13 @@
     }
       return NS_OK;
 
-  }
-
+}
 
 /* void rhGetCoolKeyPolicy (in unsigned long aKeyType, in string aKeyID, out string policy); */
 NS_IMETHODIMP rhCoolKey::GetCoolKeyPolicy(PRUint32 aKeyType, const char *aKeyID, char **policy)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhGetCoolKeyPolicy thread: %p \n",PR_GetCurrentThread()));
-
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhGetCoolKeyPolicy thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
 
     if (!aKeyID) {
         return NS_ERROR_FAILURE;
@@ -1223,14 +1203,14 @@
     AutoCoolKey key(aKeyType, aKeyID);
     HRESULT hres =  CoolKeyGetPolicy(&key, policyChar, MAX_STR_LEN);
 
-    PR_LOG(coolKeyLog,PR_LOG_DEBUG,("rhCoolKey::RhGetCoolKeyPolicy hres: %d \n",hres));
+    PR_LOG(coolKeyLog,PR_LOG_DEBUG,("%s rhCoolKey::RhGetCoolKeyPolicy hres: %d \n",GetTStamp(tBuff,56),hres));
     if (hres == E_FAIL)
     {
         return NS_ERROR_FAILURE;
 
     }
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhGetCoolKeyPolicy policy: %s \n",policyChar));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhGetCoolKeyPolicy policy: %s \n",GetTStamp(tBuff,56),policyChar));
 
      char *temp =  (char *) nsMemory::Clone(policyChar,sizeof(char) * strlen(policyChar) + 1);
 
@@ -1242,6 +1222,7 @@
 /* string GetCoolKeyIssuedTo (in unsigned long aKeyType, in string aKeyID); */
 NS_IMETHODIMP rhCoolKey::GetCoolKeyIssuedTo(PRUint32 aKeyType, const char *aKeyID, char **issuedTo)
 {
+    char tBuff[56];
     if (!aKeyID) {
         return NS_ERROR_FAILURE;
     }
@@ -1256,13 +1237,12 @@
     
     CoolKeyGetIssuedTo(&key, (char *) buff, bufLength);
 
-
     if(!buff[0])
     {
         return NS_OK;
     }
 
-    PR_LOG(coolKeyLog,PR_LOG_DEBUG,("rhCoolKey::RhGetCoolKeyGetIssuedTo  %s \n",(char *) buff));
+    PR_LOG(coolKeyLog,PR_LOG_DEBUG,("%s rhCoolKey::RhGetCoolKeyGetIssuedTo  %s \n",GetTStamp(tBuff,56),(char *) buff));
 
     char *temp =  (char *) nsMemory::Clone(buff,sizeof(char) * strlen(buff) + 1);
 
@@ -1274,7 +1254,8 @@
 /* boolean SetCoolKeyConfigValue (in string aName, in string aValue); */
 NS_IMETHODIMP rhCoolKey::SetCoolKeyConfigValue(const char *aName, const char *aValue, PRBool *_retval)
 {
-     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::SetCoolKeyConfigValue thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::SetCoolKeyConfigValue thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
     if(!aName || !aValue)
     {
         *_retval = 0;
@@ -1289,7 +1270,8 @@
 /* string GetCoolKeyConfigValue (in string aName); */
 NS_IMETHODIMP rhCoolKey::GetCoolKeyConfigValue(const char *aName, char **_retval)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyConfigValue thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyConfigValue thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
 
     if(!aName)
     {
@@ -1306,8 +1288,8 @@
 
 NS_IMETHODIMP rhCoolKey::GetCoolKeyRequiresAuthentication(PRUint32 aKeyType, const char *aKeyID, PRBool *_retval)
 {
-
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhCoolKeyRequiresAuthentication thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhCoolKeyRequiresAuthentication thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
     PRBool requiresAuth = PR_FALSE;
 
     *_retval = PR_TRUE;
@@ -1326,7 +1308,8 @@
 
 NS_IMETHODIMP rhCoolKey::GetCoolKeyIsAuthenticated(PRUint32 aKeyType, const char *aKeyID, PRBool *_retval)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhGetCoolKeyIsAuthenticated thread: %p \n",PR_GetCurrentThread()));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhGetCoolKeyIsAuthenticated thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
     PRBool isAuthed = PR_FALSE;
 
     *_retval = PR_TRUE;
@@ -1345,22 +1328,23 @@
 
 NS_IMETHODIMP rhCoolKey::AuthenticateCoolKey(PRUint32 aKeyType, const char *aKeyID, const char *aPIN, PRBool *_retval) 
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::RhAuthenticateCoolKey thread: %p \n",PR_GetCurrentThread()));
-  *_retval = PR_FALSE;
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::RhAuthenticateCoolKey thread: %p \n",GetTStamp(tBuff,56),PR_GetCurrentThread()));
+    *_retval = PR_FALSE;
 
-  if(!aKeyID || !aPIN)
-  {
-      return NS_ERROR_FAILURE;
-  }
+    if(!aKeyID || !aPIN)
+    {
+        return NS_ERROR_FAILURE;
+    }
 
-  AutoCoolKey key(aKeyType, aKeyID);
+    AutoCoolKey key(aKeyType, aKeyID);
 
-  PRBool didAuth = CoolKeyAuthenticate(&key, aPIN);
+    PRBool didAuth = CoolKeyAuthenticate(&key, aPIN);
 
-  if (didAuth)
-    ASCSetCoolKeyPin(aKeyType, aKeyID, aPIN);
+    if (didAuth)
+        ASCSetCoolKeyPin(aKeyType, aKeyID, aPIN);
 
-   *_retval = PR_TRUE;
+    *_retval = PR_TRUE;
 
     return NS_OK;
 }
@@ -1369,8 +1353,8 @@
 
 NS_IMETHODIMP rhCoolKey::SetCoolKeyDataValue(PRUint32 aKeyType, const char *aKeyID, const char *name, const char *value)
 {
-
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::SetCoolKeyDataValue \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::SetCoolKeyDataValue \n",GetTStamp(tBuff,56)));
     CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
 
     if (!node)
@@ -1381,13 +1365,13 @@
     CoolKeySetDataValue(&key,name, value);
 
     return NS_OK;
-
 }
 
 /* string GetCoolKeyVersion (); */
 NS_IMETHODIMP rhCoolKey::GetCoolKeyVersion(char **_retval)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyVersion \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetCoolKeyVersion \n",GetTStamp(tBuff,56)));
 
     char *version = GETSTRING(ESC_VERSION);
     
@@ -1532,7 +1516,8 @@
 NS_IMETHODIMP_(nsrefcnt)
 rhCoolKeyModule::AddRef(void)
 {
-PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKeyModule::AddRef \n"));
+char tBuff[56];
+PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKeyModule::AddRef \n",GetTStamp(tBuff,56)));
 ++mRefCnt;
 return mRefCnt;
 }
@@ -1541,10 +1526,12 @@
 NS_IMETHODIMP_(nsrefcnt)
 rhCoolKeyModule::Release(void)
 {
-PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKeyModule::Release \n"));
+char tBuff[56];
+PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKeyModule::Release : mRefCnt %d \n",GetTStamp(tBuff,56),mRefCnt - 1));
 --mRefCnt;
 if (mRefCnt == 0) {
 mRefCnt = 1; /* stabilize */
+PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKeyModule::Release deleting Module \n",GetTStamp(tBuff,56)));
 delete this;
 return 0;
 }
@@ -1555,7 +1542,8 @@
 NS_IMETHODIMP
 rhCoolKeyModule::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 {
-PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKeyModule::QueryInterface \n"));
+char tBuff[56];
+PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKeyModule::QueryInterface \n",GetTStamp(tBuff,56)));
 if ( !aInstancePtr )
 return NS_ERROR_NULL_POINTER;
 
@@ -1588,8 +1576,8 @@
 const nsIID& aIID,
 void** result)
 {
-
-PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKeyModule::GetClassObject \n"));
+char tBuff[56];
+PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKeyModule::GetClassObject \n",GetTStamp(tBuff,56)));
 if (!kCoolKeyCID.Equals(aClass))
 return NS_ERROR_FACTORY_NOT_REGISTERED;
 
@@ -1618,9 +1606,10 @@
 const char* componentType)
 {
 
+char tBuff[54];
 nsIComponentRegistrar* compReg = nsnull;
 
-PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKeyModule::RegisterSelf \n"));
+PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKeyModule::RegisterSelf \n",GetTStamp(tBuff,56)));
 nsresult rv = aCompMgr->QueryInterface(kIComponentRegistrarIID, (void**)&compReg);
 if (NS_FAILED(rv))
 return rv;
@@ -1642,8 +1631,8 @@
 nsIFile* aPath,
 const char* registryLocation)
 {
-
-PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKeyModule::UnregisterSelf \n"));
+char tBuff[56];
+PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKeyModule::UnregisterSelf \n",GetTStamp(tBuff,56)));
 nsIComponentRegistrar* compReg = nsnull;
 
 nsresult rv = aCompMgr->QueryInterface(kIComponentRegistrarIID, (void**)&compReg);
@@ -1673,7 +1662,8 @@
 {
 nsresult rv = NS_OK;
 
-PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKeyModule::NSGetModule \n"));
+char tBuff[56];
+PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s rhCoolKeyModule::NSGetModule \n",GetTStamp(tBuff,56)));
 
 // Create and initialize the module instance
 rhCoolKeyModule *m = new rhCoolKeyModule();
@@ -1688,5 +1678,3 @@
 }
 return rv;
 }
-
-



From fedora-directory-commits at redhat.com  Sat Feb 24 02:02:40 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:02:40 -0500
Subject: [Fedora-directory-commits] esc/src/app/xpcom/tray rhLinuxTray.cpp,
	1.3, 1.4
Message-ID: <200702240202.l1O22e2a001564@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1548

Modified Files:
	rhLinuxTray.cpp 
Log Message:
Add time stamp to log messages.



Index: rhLinuxTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhLinuxTray.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rhLinuxTray.cpp	27 Sep 2006 17:21:58 -0000	1.3
+++ rhLinuxTray.cpp	24 Feb 2007 02:02:37 -0000	1.4
@@ -37,6 +37,7 @@
 
 static PRLogModuleInfo *trayLog = PR_NewLogModule("tray");
 
+
 rhTray::rhTray() 
 {
   /* member initializers and constructor code */
@@ -46,7 +47,8 @@
 rhTray::~rhTray()
 {
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::~rhTray\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::~rhTray\n",GetTStamp(tBuff,56)));
 
 
     Cleanup();
@@ -56,12 +58,12 @@
 NS_IMETHODIMP rhTray::Setwindnotifycallback(rhITrayWindNotify *jsNotify)
 {
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setwindnotifycallback\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setwindnotifycallback\n",GetTStamp(tBuff,56)));
 
     if(jsNotify)
         AddTrayWindNotifyListener(jsNotify);
 
-
     return NS_OK;
 
 }
@@ -69,9 +71,9 @@
 
 NS_IMETHODIMP rhTray::Unsetwindnotifycallback(rhITrayWindNotify *jsNotify)
 {
+    char tBuff[56];
 
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Unsetwindnotifycallback\n"));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Unsetwindnotifycallback\n",GetTStamp(tBuff,56)));
 
     if(jsNotify)
         RemoveTrayWindNotifyListener(jsNotify);
@@ -82,12 +84,14 @@
 /* void add (); */
 NS_IMETHODIMP rhTray::Add(nsIBaseWindow *aWindow)
 {
-    
-
+    char tBuff[56];
     NS_ENSURE_ARG(aWindow);
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Add %p \n",aWindow));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Add %p \n",GetTStamp(tBuff,56),aWindow));
     HRESULT res = Initialize();
+
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Add Initialize res %d \n",GetTStamp(tBuff,56),res));
+
     if(res != S_OK)
     {
         return NS_ERROR_FAILURE;
@@ -104,23 +108,23 @@
 /* void remove (); */
 NS_IMETHODIMP rhTray::Remove(nsIBaseWindow *aWindow)
 {
-     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Remove window %p \n",aWindow));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Remove window %p \n",GetTStamp(tBuff,56),aWindow));
 
-     if(!aWindow)
+    if(!aWindow)
          return NS_OK;
 
-     HRESULT res = RemoveListener(aWindow);
+    HRESULT res = RemoveListener(aWindow);
 
-     if(res != S_OK)
-     {
-         return NS_ERROR_FAILURE;
-     }
-     return NS_OK;
+    if(res != S_OK)
+    {
+        return NS_ERROR_FAILURE;
+    }
+    return NS_OK;
 }
 
 NS_IMETHODIMP rhTray::Hide(nsIBaseWindow *aWindow)
 {
-
     rhTrayWindowListener *listener = rhTray::mWindowMap[aWindow];
 
     if(listener)
@@ -130,27 +134,22 @@
     }
 
     return NS_OK;
-
 }
 
 NS_IMETHODIMP rhTray::Show(nsIBaseWindow *aWindow)
 {
-
     rhTrayWindowListener *listener = rhTray::mWindowMap[aWindow];
 
     if(listener)
     {
         listener->ShowWindow();
-
     }
 
     return NS_OK;
- 
 }
 
 NS_IMETHODIMP rhTray::IsInitializedAlready(PRBool *_retval)
 {
-
     *_retval = 0;
 
     if(rhTray::mInitialized > 1)
@@ -158,27 +157,20 @@
 
     rhTray::mInitialized ++;
 
-
     return NS_OK;
-
-
-
 }
 
 NS_IMETHODIMP rhTray::Sendnotification(const char *aTitle,const char *aMessage,PRUint32 aSeverity,PRUint32 aTimeout, const char *aIcon)
 {
-
    if(aMessage)
        notify_icon_send_tooltip_msg(aTitle,aMessage,aSeverity,aTimeout,aIcon);
 
     return NS_OK;
-
 }
 
 /* void hideall (); */
 NS_IMETHODIMP rhTray::Hideall() 
 {
-
     HideAllListeners();
     return NS_OK;
 }
@@ -193,7 +185,6 @@
 /* void settooltipmsg (in string aMessage); */
 NS_IMETHODIMP rhTray::Settooltipmsg(const char *aMessage)
 {
-
     if(aMessage)
         notify_icon_set_static_tooltip(aMessage);
 
@@ -203,43 +194,35 @@
 /* void seticonimage (in string aIcon); */
 NS_IMETHODIMP rhTray::Seticonimage(const char *aIcon) 
 {
-
-
     return NS_OK;
 }
 
 /* void hideicon (); */
 NS_IMETHODIMP rhTray::Hideicon(void)
 {
-
-
     notify_icon_hide();
-
     return NS_OK;
 }
 
 /* void showicon (); */
 NS_IMETHODIMP rhTray::Showicon(void)
 {
-
     notify_icon_show();
-
     return NS_OK;
 }
 
 HRESULT rhTray::Initialize()
 {
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize entering... mInitialized: %d \n",GetTStamp(tBuff,56),mInitialized));
 
     if(mInitialized)
     {
         return S_OK;
     }
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize  \n"));
-
-
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize  \n",GetTStamp(tBuff,56)));
     g_set_print_handler(rhTray::TrayPrintHandler);
-  
     notify_icon_create_with_image_file(COOLKEY_ICON);
  
     HRESULT res = notify_icon_created_ok(); 
@@ -248,19 +231,17 @@
     {
        return E_FAIL;
     }
-
     
     GtkWidget *icon_widget = notify_icon_get_box_widget();
 
     if(icon_widget)
     {
         g_signal_connect(G_OBJECT(icon_widget), "button-press-event", G_CALLBACK(rhTray::IconCBProc), NULL);
-
     }
 
     res = CreateEventWindow();
 
-     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize result of CreateIconMenu %d \n",res));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize result of CreateIconMenu %d \n",GetTStamp(tBuff,56),res));
 
     if(res != S_OK)
     {
@@ -269,7 +250,6 @@
 
     mInitialized = 1;
 
-
     return S_OK;
 }
 
@@ -280,7 +260,8 @@
 
 HRESULT rhTray::Cleanup()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Cleanup.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Cleanup.\n",GetTStamp(tBuff,56)));
 
     RemoveAllListeners();
     DestroyEventWindow();
@@ -291,32 +272,27 @@
 
 void rhTray::ShowAllListeners()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowAllListeners.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ShowAllListeners.\n",GetTStamp(tBuff,56)));
     map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
 
     rhTrayWindowListener *cur = NULL;
 
     for(i = rhTray::mWindowMap.begin(); i!= rhTray::mWindowMap.end(); i++)
     {
-
-         cur = (*i).second;
+        cur = (*i).second;
 
         if(cur)
         {
             cur->ShowWindow();
-
         }
-
     }
-
-
 }
 
-
 void rhTray::HideAllListeners()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::HideAllListeners.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::HideAllListeners.\n",GetTStamp(tBuff,56)));
 
     map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
 
@@ -329,28 +305,23 @@
         if(cur)
         {
             cur->HideWindow();
-
         }
-
     }
-
 }
 
 HRESULT rhTray::DestroyEventWindow()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::DestroyEventWindow \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::DestroyEventWindow \n",GetTStamp(tBuff,56)));
 
     rhTray::mWnd = 0;
-
     return S_OK;
 }
 
 void rhTray::IconMenuCBProc(GtkWidget *widget, gpointer data)
 {
-
-     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::IconMenuCBProc data %s \n",data));
-
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::IconMenuCBProc data %s \n",GetTStamp(tBuff,56),data));
 
     if(!strcmp((char *)data,"icon.min"))
     {
@@ -371,8 +342,8 @@
 
 HRESULT rhTray::CreateIconMenu()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::CreateIconMenu \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::CreateIconMenu \n",GetTStamp(tBuff,56)));
 
     if(mIconMenu)
         return E_FAIL;
@@ -407,20 +378,17 @@
 
 void rhTray::IconCBProc(GtkWidget *button, GdkEventButton *event, void *data)
 {
-
-     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::IconCBProc \n"));
-
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::IconCBProc \n",GetTStamp(tBuff,56)));
 
     if(event->type != GDK_BUTTON_PRESS)
     {
        return;
-
     }
 
     if(event->button == 1)
     {
-
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::IconCBProc Clicked!\n"));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::IconCBProc Clicked!\n",GetTStamp(tBuff,56)));
 
         NotifyTrayWindListeners(MENU_EVT,MENU_SHOW);
         rhTray::ShowAllListeners();
@@ -430,7 +398,6 @@
 
     if(event->button == 2 || event->button == 3)
     {
-
         if(mIconMenu)
         {
                 g_print("trying to create popup menu. \n");
@@ -449,8 +416,8 @@
 
 HRESULT rhTray::CreateEventWindow()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::CreateEventWindow \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::CreateEventWindow \n",GetTStamp(tBuff,56)));
 
     HRESULT res = CreateIconMenu();
     return res;
@@ -458,17 +425,15 @@
 
 HRESULT rhTray::AddListener(nsIBaseWindow *aWindow)
 {
-
+    char tBuff[56];
     nsresult rv;
 
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddListener %p \n",aWindow));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddListener %p \n",GetTStamp(tBuff,56),aWindow));
     NS_ENSURE_ARG(aWindow);
 
-     nativeWindow aNativeWindow;
+    nativeWindow aNativeWindow;
     rv = aWindow->GetParentNativeWindow( &aNativeWindow );
 
-
     if(NS_FAILED(rv))
     {
         return E_FAIL;
@@ -479,8 +444,7 @@
 
     gdk_window_get_user_data (gWnd,(void **)&hWnd);
 
-
-    PR_LOG(trayLog,PR_LOG_DEBUG, ("rhTray::AddListener is widget %p .\n",hWnd));
+    PR_LOG(trayLog,PR_LOG_DEBUG, ("%s rhTray::AddListener is widget %p .\n",GetTStamp(tBuff,56),hWnd));
     if(!hWnd)
     {
         return E_FAIL;
@@ -493,22 +457,21 @@
 
     if(already)
     {
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener Window already registered  %p \n",aWindow));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener Window already registered  %p \n",GetTStamp(tBuff,56),aWindow));
         return S_OK;
 
     }
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener current level widget  %p \n",hWnd));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener current level widget  %p \n",GetTStamp(tBuff,56),hWnd));
 
     hWnd = gtk_widget_get_toplevel( hWnd);
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener top level widget  %p \n",hWnd));
-
-   if (GTK_WIDGET_TOPLEVEL (hWnd))
-   {
-       PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener is really a top level widget  %p \n",hWnd));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener top level widget  %p \n",GetTStamp(tBuff,56),hWnd));
 
-   }
+    if (GTK_WIDGET_TOPLEVEL (hWnd))
+    {
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener is really a top level widget  %p \n",GetTStamp(tBuff,56),hWnd));
+    }
     rhTrayWindowListener *create = new rhTrayWindowListener(hWnd);
 
     if(!create)
@@ -535,8 +498,8 @@
 
 HRESULT rhTray::RemoveListener(nsIBaseWindow *aBaseWindow)
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveWindowListener %p \n",aBaseWindow));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveWindowListener %p \n",GetTStamp(tBuff,56),aBaseWindow));
 
     if(!aBaseWindow)
         return S_OK;
@@ -563,22 +526,19 @@
 
 HRESULT rhTray::RemoveAllListeners()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveAllListenesr\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveAllListenesr\n",GetTStamp(tBuff,56)));
     map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
 
     rhTrayWindowListener *cur = NULL;
 
     for(i = rhTray::mWindowMap.begin(); i!= rhTray::mWindowMap.end(); i++)
     {
-
         cur = (*i).second;
 
         if(cur)
         {
-
             delete cur;
-
         }
 
     }
@@ -586,14 +546,13 @@
     rhTray::mWindowMap.clear();
  
     return S_OK;
-
 }
 
 /* void setmenuitemtext (in unsigned long aIndex, in string aText); */
 NS_IMETHODIMP rhTray::Setmenuitemtext(PRUint32 aIndex, const char *aText)
 {
-
-     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setmenuitemtext:  index: %d text %s. \n",aIndex,aText));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setmenuitemtext:  index: %d text %s. \n",GetTStamp(tBuff,56),aIndex,aText));
 
     if(!aText)
         return S_OK;
@@ -611,17 +570,16 @@
     unsigned int i = 0;
     for (iterate = children; iterate; iterate=iterate->next)
     {
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setmenuitemtext:  index: %d \n",i));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setmenuitemtext:  index: %d \n",GetTStamp(tBuff,56),i));
         if(aIndex == i)
         {
-             PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setmenuitemtext:  About to reset text of item %p. \n",(void *) iterate->data));
+             PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setmenuitemtext:  About to reset text of item %p. \n",GetTStamp(tBuff,56),(void *) iterate->data));
              if(iterate->data)
              {
                 GtkWidget *label = gtk_bin_get_child(GTK_BIN(iterate->data)); 
 
                 if(label)
                 {
-
                     gtk_label_set_text(GTK_LABEL(label),aText);
                 }
              }
@@ -639,55 +597,45 @@
 
 rhITrayWindNotify* rhTray::GetTrayWindNotifyListener(rhITrayWindNotify *listener)
 {
-
+    char tBuff[56];
     std::list<nsCOMPtr<rhITrayWindNotify> >::const_iterator it;
 
     for(it=gTrayWindNotifyListeners.begin(); it!=gTrayWindNotifyListeners.end(); ++it) {
 
-    if((*it) == listener)
-    {
-        return (*it);
+        if((*it) == listener)
+        {
+            return (*it);
+        }
     }
-}
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::GetNotifyKeyListener:  looking for %p returning NULL. \n",listener));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetNotifyKeyListener:  looking for %p returning NULL. \n",GetTStamp(tBuff,56),listener));
 
     return nsnull;
-
-
-
 }
 
 int rhTray::GetTrayWindNotifyListSize()
 {
     return gTrayWindNotifyListeners.size();
-
 }
 
-
 void rhTray::AddTrayWindNotifyListener(rhITrayWindNotify *listener)
 {
-
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddTrayWindNotifyListener: %p \n",
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddTrayWindNotifyListener: %p \n", GetTStamp(tBuff,56),
 listener));
 
     if(GetTrayWindNotifyListener(listener ))
     {
-
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddTrayWindNotifyListener: %p listener already in list. \n",listener));
-
+         PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddTrayWindNotifyListener: %p listener already in list. \n",GetTStamp(tBuff,56),listener));
          return ;
 
     }
 
     gTrayWindNotifyListeners.push_back(listener);
-
-
 }
 
 void rhTray::RemoveTrayWindNotifyListener(rhITrayWindNotify *listener)
 {
-
     if(!GetTrayWindNotifyListener(listener))
     {
         return;
@@ -695,14 +643,11 @@
 
     gTrayWindNotifyListeners.remove(listener);
 
-
     listener = NULL;
 }
 
-
 void rhTray::ClearTrayWindNotifyList()
 {
-
      while (gTrayWindNotifyListeners.size() > 0) {
          rhITrayWindNotify * node = (gTrayWindNotifyListeners.front()).get();
 
@@ -716,7 +661,8 @@
 void rhTray::NotifyTrayWindListeners(PRUint32 aEvent, PRUint32 aEventData,PRUint32 aKeyData,PRUint32 aData1, PRUint32 aData2)
 {
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::NotifyTrayWindListeners \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::NotifyTrayWindListeners \n",GetTStamp(tBuff,56)));
      
       //Now notify all the listeners of the event
 
@@ -725,10 +671,9 @@
 
         PRBool claimed = 0;
 
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("NotifyTrayWindListeners about to notify \n"));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s NotifyTrayWindListeners about to notify \n",GetTStamp(tBuff,56)));
         ((rhITrayWindNotify *) (*it))->RhTrayWindEventNotify(aEvent,aEventData, aKeyData, aData1, aData2, &claimed);
 
-
     }
 
 }
@@ -736,9 +681,8 @@
 
 void rhTray::TrayPrintHandler(const gchar *string)
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray:TrayPrintHandler. : %s \n",(char *) string));
-
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray:TrayPrintHandler. : %s \n",GetTStamp(tBuff,56),(char *) string));
 }
 //rhTrayWindowListener Methods
 
@@ -749,12 +693,14 @@
 
 rhTrayWindowListener::~rhTrayWindowListener()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::rhTrayWindowListener.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::rhTrayWindowListener.\n",GetTStamp(tBuff,56)));
 }
 
 HRESULT rhTrayWindowListener::Initialize()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::Initialize \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::Initialize \n",GetTStamp(tBuff,56)));
 
     if(mWnd)
     {
@@ -770,6 +716,7 @@
 
 void rhTrayWindowListener::ShowWindow()
 {
+    char tBuff[56];
     if(mWnd)
     {
          GtkWidget *widget = NULL;
@@ -790,27 +737,27 @@
              }
          }
 
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow \n"));
+         PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: ShowWindow \n",GetTStamp(tBuff,56)));
     }
-
 }
 
 void rhTrayWindowListener::HideWindow()
 {
+    char tBuff[56];
     if(mWnd)
     {
         gtk_widget_hide(mWnd);
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: Hide Window  %p\n",mWnd));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: Hide Window  %p\n",GetTStamp(tBuff,56),mWnd));
     }
 }
 
 void rhTrayWindowListener::WndDestroyCBProc( GtkWidget *widget,
                      gpointer   data )
 {
-
+    char tBuff[56];
     g_print("WndDestroyCBProc \n");
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WndDestroyCBProc \n"));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::WndDestroyCBProc \n",GetTStamp(tBuff,56)));
 
 }
 
@@ -818,9 +765,10 @@
                               GdkEvent  *event,
                               gpointer   data )
 {
+    char tBuff[56];
     g_print("WndDeleteCBProc\n");
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WndDeleteCBProc \n"));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::WndDeleteCBProc \n",GetTStamp(tBuff,56)));
 
     rhTrayWindowListener *me = (rhTrayWindowListener *) data;
 



From fedora-directory-commits at redhat.com  Sat Feb 24 02:04:34 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:04:34 -0500
Subject: [Fedora-directory-commits] 
	esc/src/app/xpcom/tray rhMacTray.cpp, 1.4, 1.5
Message-ID: <200702240204.l1O24Yjl001659@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1642

Modified Files:
	rhMacTray.cpp 
Log Message:
Add time stamp to log messages.



Index: rhMacTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhMacTray.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rhMacTray.cpp	25 Oct 2006 03:59:03 -0000	1.4
+++ rhMacTray.cpp	24 Feb 2007 02:04:32 -0000	1.5
@@ -47,8 +47,8 @@
 
 rhTray::~rhTray()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::~rhTray\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::~rhTray\n",GetTStamp(tBuff,56)));
 
 
     Cleanup();
@@ -57,8 +57,8 @@
 
 NS_IMETHODIMP rhTray::Setwindnotifycallback(rhITrayWindNotify *jsNotify)
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setwindnotifycallback\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setwindnotifycallback\n",GetTStamp(tBuff,56)));
 
     if(jsNotify)
         AddTrayWindNotifyListener(jsNotify);
@@ -71,9 +71,8 @@
 
 NS_IMETHODIMP rhTray::Unsetwindnotifycallback(rhITrayWindNotify *jsNotify)
 {
-
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Unsetwindnotifycallback\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Unsetwindnotifycallback\n",GetTStamp(tBuff,56)));
 
     if(jsNotify)
         RemoveTrayWindNotifyListener(jsNotify);
@@ -84,11 +83,11 @@
 /* void add (); */
 NS_IMETHODIMP rhTray::Add(nsIBaseWindow *aWindow)
 {
-    
+    char tBuff[56]; 
 
     NS_ENSURE_ARG(aWindow);
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Add %p \n",aWindow));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Add %p \n",GetTStamp(tBuff,56),aWindow));
     HRESULT res = Initialize();
 
     if(res != S_OK)
@@ -107,7 +106,8 @@
 /* void remove (); */
 NS_IMETHODIMP rhTray::Remove(nsIBaseWindow *aWindow)
 {
-     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Remove window %p \n",aWindow));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Remove window %p \n",GetTStamp(tBuff,56),aWindow));
 
      if(!aWindow)
          return NS_OK;
@@ -123,7 +123,6 @@
 
 NS_IMETHODIMP rhTray::Hide(nsIBaseWindow *aWindow)
 {
-
     rhTrayWindowListener *listener = rhTray::mWindowMap[aWindow];
 
     if(listener)
@@ -133,28 +132,23 @@
     }
 
     return NS_OK;
-
 }
 
 NS_IMETHODIMP rhTray::Show(nsIBaseWindow *aWindow)
 {
-
     rhTrayWindowListener *listener = rhTray::mWindowMap[aWindow];
 
     if(listener)
     {
         listener->ShowWindow();
-
     }
 
     return NS_OK;
- 
 }
 
 /* void hideall (); */
 NS_IMETHODIMP rhTray::Hideall()
 {
-
     HideAllListeners();
     return NS_OK;
 }
@@ -168,7 +162,6 @@
 
 NS_IMETHODIMP rhTray::IsInitializedAlready(PRBool *_retval)
 {
-
     *_retval = 0;
 
     if(rhTray::mInitialized > 1)
@@ -176,17 +169,12 @@
 
     rhTray::mInitialized ++;
 
-
     return NS_OK;
-
-
-
 }
 
 NS_IMETHODIMP rhTray::Sendnotification(const char *aTitle,const char *aMessage,PRUint32 aSeverity,PRUint32 aTimeout, const char *aIcon)
 {
     return NS_OK;
-
 }
 
 /* void settooltipmsg (in string aMessage); */
@@ -198,64 +186,53 @@
 /* void seticonimage (in string aIcon); */
 NS_IMETHODIMP rhTray::Seticonimage(const char *aIcon)
 {
-
-
     return NS_OK;
 }
 
 /* void hideicon (); */
 NS_IMETHODIMP rhTray::Hideicon(void)
 {
-
-
     return NS_OK;
 }
 
 /* void showicon (); */
 NS_IMETHODIMP rhTray::Showicon(void)
 {
-
-
     return NS_OK;
 }
 
 void rhTray::ShowApp()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Show app!  \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Show app!  \n",GetTStamp(tBuff,56)));
   
     ::ShowHideProcess(&rhTray::mPSN,TRUE);
     ::SetFrontProcess(&rhTray::mPSN);
-
 }
 
 void rhTray::HideApp()
 {
-
     ::ShowHideProcess(&rhTray::mPSN,FALSE);
-
 }
 
 
 HRESULT rhTray::Initialize()
 {
-
+    char tBuff[56];
     if(mInitialized)
         return S_OK;
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize  dock:  \n"));
-
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize  dock:  \n",GetTStamp(tBuff,56)));
 
     OSErr pRes =  GetCurrentProcess (
         &mPSN 
     );
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize App PID result %d  \n",pRes));
-  
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize App PID result %d  \n",GetTStamp(tBuff,56),pRes));
      
     HRESULT res = CreateApplicationListener();
 
-     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize result of CreateApplicationListener %d \n",res));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize result of CreateApplicationListener %d \n",GetTStamp(tBuff,56),res));
 
     if(res != S_OK)
     {
@@ -276,10 +253,10 @@
 
         if(result == noErr)
         {
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize result of SetApplicationDockTileMenu %d \n",result));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize result of SetApplicationDockTileMenu %d \n",GetTStamp(tBuff,56),result));
             mDockMenu = GetApplicationDockTileMenu();
 
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize result of GetApplicationDockTileMenu: %d . \n",mDockMenu));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize result of GetApplicationDockTileMenu: %d . \n",GetTStamp(tBuff,56),mDockMenu));
         }
     }
 
@@ -321,22 +298,20 @@
     }
 
     mInitialized = 1;
-
     return S_OK;
 }
 
 HRESULT rhTray::RemoveIcon()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveIcon. \n"));
-
-
-
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveIcon. \n",GetTStamp(tBuff,56)));
     return S_OK;
 }
 
 HRESULT rhTray::Cleanup()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Cleanup.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Cleanup.\n",GetTStamp(tBuff,56)));
 
     RemoveAllListeners();
     DestroyEventWindow();
@@ -345,13 +320,11 @@
     if(mEventHandlerRef)
     {
         ::RemoveEventHandler(mEventHandlerRef);
-
     }
 
     if(mEventHandlerUPP)
     {
         ::DisposeEventHandlerUPP(mEventHandlerUPP);
-
     }
 
     if(mDockMenu)
@@ -359,7 +332,6 @@
         ::ReleaseMenu(mDockMenu);
     }
 
-
     MenuRef goMenu = GetMenuHandle (GO_MENU_ID);
 
     if(goMenu)
@@ -377,21 +349,19 @@
 
 HRESULT rhTray::CreateApplicationListener()
 {
+    char tBuff[56];
     EventTargetRef target  = GetApplicationEventTarget();
 
     if(!target)
         return E_FAIL;
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::CreateApplicationListener . app target %p\n",target));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::CreateApplicationListener . app target %p\n",GetTStamp(tBuff,56),target));
     int numTypes = 4;
 
-
     rhTray::mEventHandlerUPP = NewEventHandlerUPP(rhTray::ApplicationProc);
 
     if(!rhTray::mEventHandlerUPP)
         return E_FAIL;
-
-
     
     EventTypeSpec eventTypes[]= { {kEventClassApplication, kEventAppActivated } , {kEventClassApplication , kEventAppDeactivated }, {kEventClassCommand, kEventCommandProcess}};
 
@@ -401,32 +371,28 @@
 
 void rhTray::ShowAllListeners()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowAllListeners.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ShowAllListeners.\n",GetTStamp(tBuff,56)));
     map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
 
     rhTrayWindowListener *cur = NULL;
 
     for(i = rhTray::mWindowMap.begin(); i!= rhTray::mWindowMap.end(); i++)
     {
-
-         cur = (*i).second;
+        cur = (*i).second;
 
         if(cur)
         {
             cur->ShowWindow();
-
         }
 
     }
-
-
 }
 
-
 void rhTray::HideAllListeners()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::HideAllListeners.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::HideAllListeners.\n",GetTStamp(tBuff,56)));
 
     map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
 
@@ -438,20 +404,15 @@
 
         if(cur)
         {
-            
             cur->HideWindow();
-
         }
-
     }
-
 }
 
 HRESULT rhTray::DestroyEventWindow()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::DestroyEventWindow \n"));
-
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::DestroyEventWindow \n",GetTStamp(tBuff,56)));
 
     return S_OK;
 }
@@ -459,17 +420,15 @@
 
 HRESULT rhTray::AddListener(nsIBaseWindow *aWindow)
 {
-
+    char tBuff[56];
     nsresult rv;
 
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddListener %p \n",aWindow));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddListener %p \n",GetTStamp(tBuff,56),aWindow));
     NS_ENSURE_ARG(aWindow);
 
     nativeWindow aNativeWindow;
     rv = aWindow->GetParentNativeWindow( &aNativeWindow );
 
-
     if(NS_FAILED(rv))
     {
         return E_FAIL;
@@ -477,29 +436,25 @@
 
     nsIWidget *widget= nsnull;
 
-
     WindowRef hWnd = (WindowRef) aNativeWindow;
 
     //Now see if it's alreay in the map
 
-
     rv = aWindow->GetParentWidget(&widget);
 
     if(widget)
     {
         hWnd  =(WindowRef) widget->GetNativeData(NS_NATIVE_DISPLAY);
-
     }
     rhTrayWindowListener *already = rhTray::mWindowMap[aWindow];
 
     if(already)
     {
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener Window already registered  %p \n",aWindow));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener Window already registered  %p \n",GetTStamp(tBuff,56),aWindow));
         return S_OK;
-
     }
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener top level widget  %p \n",hWnd));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener top level widget  %p \n",GetTStamp(tBuff,56),hWnd));
 
     rhTrayWindowListener *create = new rhTrayWindowListener(hWnd);
 
@@ -526,8 +481,8 @@
 
 HRESULT rhTray::RemoveListener(nsIBaseWindow *aBaseWindow)
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveWindowListener %p \n",aBaseWindow));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveWindowListener %p \n",GetTStamp(tBuff,56),aBaseWindow));
 
     if(!aBaseWindow)
         return S_OK;
@@ -554,41 +509,36 @@
 
 HRESULT rhTray::RemoveAllListeners()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveAllListenesr\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveAllListenesr\n",GetTStamp(tBuff,56)));
     map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
 
     rhTrayWindowListener *cur = NULL;
 
     for(i = rhTray::mWindowMap.begin(); i!= rhTray::mWindowMap.end(); i++)
     {
-
         cur = (*i).second;
 
         if(cur)
         {
-
             delete cur;
-
         }
-
     }
    
     rhTray::mWindowMap.clear();
  
     return S_OK;
-
 }
 
 /* void setmenuitemtext (in unsigned long aIndex, in string aText); */
 NS_IMETHODIMP rhTray::Setmenuitemtext(PRUint32 aIndex, const char *aText)
 {
-
+    char tBuff[56];
     // On the Mac , we support only one menu item
 
     if(aIndex == 0 && aText)
     {
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext  aIndex: %d text %s. \n",aIndex,aText));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::Setmenuitemtext  aIndex: %d text %s. \n",GetTStamp(tBuff,56),aIndex,aText));
 
         MenuRef outMenu;
         MenuItemIndex theIndex;
@@ -601,12 +551,11 @@
              &theIndex
         );
 
-
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext  Result of menu item: %d. \n",result));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::Setmenuitemtext  Result of menu item: %d. \n",GetTStamp(tBuff,56),result));
    
         if(result == noErr)
         {
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext changing item index:    %d . \n",theIndex));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::Setmenuitemtext changing item index:    %d . \n",GetTStamp(tBuff,56),theIndex));
             CFStringRef cfStr= CFStringCreateWithCString (
                 NULL,
                 aText,
@@ -619,16 +568,14 @@
                cfStr 
             );
 
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext  Result of setting item text: %d. \n",result));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::Setmenuitemtext  Result of setting item text: %d. \n",GetTStamp(tBuff,56),result));
 
         }
 
-
         // Now take care of the root menu, provide exact same item here
 
        MenuRef tGoMenu = GetMenuHandle (GO_MENU_ID);
 
-
        if(!tGoMenu)
        {
            return S_OK;
@@ -645,12 +592,11 @@
              &theGoIndex
         );
 
-
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext  Result of menu item for go menu: %d. \n",result));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::Setmenuitemtext  Result of menu item for go menu: %d. \n",GetTStamp(tBuff,56),result));
   
         if(resultRoot == noErr)
         {
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext changing item index:    %d . For go  menu. \n",theIndex));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::Setmenuitemtext changing item index:    %d . For go  menu. \n",GetTStamp(tBuff,56),theIndex));
             CFStringRef cfStr= CFStringCreateWithCString (
                 NULL,
                 aText,
@@ -663,13 +609,9 @@
                cfStr
             );
 
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::Setmenuitemtext  Result of setting item text for root menu: %d. \n",result));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::Setmenuitemtext  Result of setting item text for root menu: %d. \n",GetTStamp(tBuff,56),result));
 
         }
-
-
-
-
     }
 
     return S_OK;
@@ -680,7 +622,7 @@
 
 rhITrayWindNotify* rhTray::GetTrayWindNotifyListener(rhITrayWindNotify *listener)
 {
-
+    char tBuff[56];
     std::list<nsCOMPtr<rhITrayWindNotify> >::const_iterator it;
 
     for(it=gTrayWindNotifyListeners.begin(); it!=gTrayWindNotifyListeners.end(); ++it) {
@@ -691,43 +633,33 @@
     }
 }
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::GetNotifyKeyListener:  looking for %p returning NULL. \n",listener));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetNotifyKeyListener:  looking for %p returning NULL. \n",GetTStamp(tBuff,56),listener));
 
     return nsnull;
-
-
-
 }
 
 int rhTray::GetTrayWindNotifyListSize()
 {
     return gTrayWindNotifyListeners.size();
-
 }
 
 void rhTray::AddTrayWindNotifyListener(rhITrayWindNotify *listener)
 {
-
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddTrayWindNotifyListener: %p \n",
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddTrayWindNotifyListener: %p \n",GetTStamp(tBuff,56),
 listener));
 
     if(GetTrayWindNotifyListener(listener ))
     {
-
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddTrayWindNotifyListener: %p listener already in list. \n",listener));
-
+         PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddTrayWindNotifyListener: %p listener already in list. \n",GetTStamp(tBuff,56),listener));
          return ;
-
     }
 
     gTrayWindNotifyListeners.push_back(listener);
-
-
 }
 
 void rhTray::RemoveTrayWindNotifyListener(rhITrayWindNotify *listener)
 {
-
     if(!GetTrayWindNotifyListener(listener))
     {
         return;
@@ -735,13 +667,11 @@
 
     gTrayWindNotifyListeners.remove(listener);
 
-
     listener = NULL;
 }
 
 void rhTray::ClearTrayWindNotifyList()
 {
-
      while (gTrayWindNotifyListeners.size() > 0) {
          rhITrayWindNotify * node = (gTrayWindNotifyListeners.front()).get();
 
@@ -749,12 +679,11 @@
 
          gTrayWindNotifyListeners.pop_front();
      }
-
 }
 
 void rhTray::NotifyTrayWindListeners(PRUint32 aEvent, PRUint32 aEventData,PRUint32 aKeyData,PRUint32 aData1, PRUint32 aData2)
 {
-
+    char tBuff[56];
       //Now notify all the listeners of the event
 
     std::list< nsCOMPtr <rhITrayWindNotify> >::const_iterator it;
@@ -762,46 +691,40 @@
 
         PRBool claimed = 0;
 
-        PR_LOG(trayLog, PR_LOG_DEBUG, ("rhTray::NotifyTrayWindListener:   . \n"));
+        PR_LOG(trayLog, PR_LOG_DEBUG, ("%s rhTray::NotifyTrayWindListener:   . \n",GetTStamp(tBuff,56)));
         ((rhITrayWindNotify *) (*it))->RhTrayWindEventNotify(aEvent,aEventData, aKeyData, aData1, aData2, &claimed);
 
-
     }
 
 }
 
 pascal OSStatus rhTray::ApplicationProc(EventHandlerCallRef nextHandler, EventRef aEvent, void *userData)
 {
-
+    char tBuff[56];
     OSStatus result = eventNotHandledErr;
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc .\n"));
-
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc .\n",GetTStamp(tBuff,56)));
 
     int theEvent = GetEventKind(aEvent);
     int theClass = GetEventClass(aEvent);
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc  class %d event: %d \n",theClass,theEvent));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc  class %d event: %d \n",GetTStamp(tBuff,56),theClass,theEvent));
 
     switch(theClass)
     {
-
         case kEventClassApplication: 
 
             switch(theEvent)
             {
-
                  case kEventAppActivated:
-                   PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App activated! \n"));
-                   result = noErr;
-                   break;
+                     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App activated! \n",GetTStamp(tBuff,56)));
+                     result = noErr;
+                  break;
 
                  case kEventAppDeactivated:
-
-                     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App deactivated! \n"));
+                     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App deactivated! \n",GetTStamp(tBuff,56)));
                      result = noErr;
                  break;
-                 
 
             };
 
@@ -809,9 +732,7 @@
 
         case kEventClassCommand:
 
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App kEventClassCommand! \n"));
-
-
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App kEventClassCommand! \n",GetTStamp(tBuff,56)));
              HICommand commandStruct; 
 
              GetEventParameter (aEvent, kEventParamDirectObject, 
@@ -821,24 +742,24 @@
             switch(commandStruct.commandID)
             {
                  case kHICommandHide:
-                     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App kHICommandHide! \n"));
+                     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App kHICommandHide! \n",GetTStamp(tBuff,56)));
                  break; 
                
                  case kHICommandSelectWindow:
-                     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App kHICommandSelectWindow! \n"));
+                     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App kHICommandSelectWindow! \n",GetTStamp(tBuff,56)));
                  break;
 
                  case kHICommandClose:
-                     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App kHICommandClose! \n"));
+                     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App kHICommandClose! \n",GetTStamp(tBuff,56)));
                  break;
 
                  case kHICommandQuit:
-                     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App kHICommandQuit! \n"));
+                     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App kHICommandQuit! \n",GetTStamp(tBuff,56)));
 
                  break;
 
                  case MENU_ITEM_ID_BASE:
-                     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ApplicationProc App Manage Smart Cards! \n"));
+                     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App Manage Smart Cards! \n",GetTStamp(tBuff,56)));
                      NotifyTrayWindListeners(MENU_EVT,MENU_SHOW);
 
                  break;
@@ -852,7 +773,6 @@
         break;
     } 
 
-
     return result;
 }
 
@@ -865,14 +785,16 @@
 
 rhTrayWindowListener::~rhTrayWindowListener()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::~rhTrayWindowListener.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::~rhTrayWindowListener.\n",GetTStamp(tBuff,56)));
 
     Cleanup();
 }
 
 HRESULT rhTrayWindowListener::Initialize()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::Initialize \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::Initialize \n",GetTStamp(tBuff,56)));
 
     mEventHandlerUPP = NewEventHandlerUPP(rhTrayWindowListener::WindowProc);
 
@@ -895,28 +817,26 @@
 
 void rhTrayWindowListener::ShowWindow()
 {
-
+    char tBuff[56];
     if(mWnd)
     {
-
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow \n"));
+         PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: ShowWindow \n",GetTStamp(tBuff,56)));
 
          if(IsWindowCollapsed(mWnd))
         { 
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow :  uncollapsing collapsed window. \n"));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: ShowWindow :  uncollapsing collapsed window. \n",GetTStamp(tBuff,56)));
             //::CollapseWindow(mWnd,FALSE);
          }
 
-
          if(!IsWindowVisible(mWnd))
          {
-             PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow : Window not visible showing...  \n"));
+             PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: ShowWindow : Window not visible showing...  \n",GetTStamp(tBuff,56)));
              //::ShowWindow(mWnd);
          }
 
 
          ::BringToFront(mWnd);
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow :  \n"));
+         PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: ShowWindow :  \n",GetTStamp(tBuff,56)));
 
          rhTray::ShowApp();
 
@@ -925,46 +845,45 @@
 
 void rhTrayWindowListener::HideWindow()
 {
+    char tBuff[56];
     if(mWnd)
     {
-
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: HideWindow \n"));
+         PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: HideWindow \n",GetTStamp(tBuff,56)));
     }
 
 }
 
 pascal OSStatus rhTrayWindowListener::WindowProc(EventHandlerCallRef nextHandler, EventRef aEvent, void *userData)
 {
-
+    char tBuff[56];
     OSStatus result = eventNotHandledErr;
 
     rhTrayWindowListener * self = (rhTrayWindowListener *) userData;
 
     int theEvent = GetEventKind(aEvent);
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WindowProc event: %d \n",theEvent));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::WindowProc event: %d \n",GetTStamp(tBuff,56),theEvent));
     switch(theEvent)
     {
 
         case kEventWindowClose:
 
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WindowProc attempting Window close! \n"));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::WindowProc attempting Window close! \n",GetTStamp(tBuff,56)));
 
         break;
 
         case kEventWindowHidden:
 
-             PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WindowProc attempting Window hide! \n"));
+             PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::WindowProc attempting Window hide! \n",GetTStamp(tBuff,56)));
         break;
 
         case kEventWindowClosed:
 
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WindowProc Window closed! \n"));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::WindowProc Window closed! \n",GetTStamp(tBuff,56)));
         break;
 
         case kEventMouseDown:
-
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WindowProc mouse down! \n"));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::WindowProc mouse down! \n",GetTStamp(tBuff,56)));
         break;
 
     }
@@ -974,13 +893,12 @@
 
 HRESULT rhTrayWindowListener::Cleanup()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::Cleanup. \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::Cleanup. \n",GetTStamp(tBuff,56)));
 
     if(mEventHandlerRef)
     {
         ::RemoveEventHandler(mEventHandlerRef);
-
     }
 
     if(mEventHandlerUPP)
@@ -989,7 +907,6 @@
     }
 
     return S_OK;
-
 }
 
 



From fedora-directory-commits at redhat.com  Sat Feb 24 02:05:15 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:05:15 -0500
Subject: [Fedora-directory-commits] esc/src/app/xpcom/tray rhTray.cpp, 1.5,
	1.6
Message-ID: <200702240205.l1O25FiO001694@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1677

Modified Files:
	rhTray.cpp 
Log Message:
Add time stamp to log file.



Index: rhTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhTray.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rhTray.cpp	30 Nov 2006 18:29:09 -0000	1.5
+++ rhTray.cpp	24 Feb 2007 02:05:13 -0000	1.6
@@ -20,6 +20,7 @@
 #include "rhTray.h"
 #include "nsIGenericFactory.h"
 #include <prlog.h>
+#include <time.h>
 
 NS_IMPL_ISUPPORTS1(rhTray, rhITray)
 
@@ -29,10 +30,8 @@
 int rhTray::mInitialized = 0;
 ATOM rhTray::mWndClass = 0;
 
-
 std::list< nsCOMPtr<rhITrayWindNotify> > rhTray::gTrayWindNotifyListeners;
 
-
 map< nsIBaseWindow *, rhTrayWindowListener *> rhTray::mWindowMap;
 map<unsigned int,string> rhTray::mMenuItemStringMap;
 
@@ -56,8 +55,8 @@
 
 rhTray::~rhTray()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::~rhTray\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::~rhTray\n",GetTStamp(tBuff,56)));
 
 
     Cleanup();
@@ -66,7 +65,8 @@
 
 NS_IMETHODIMP rhTray::Setwindnotifycallback(rhITrayWindNotify *jsNotify)
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setwindnotifycallback\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setwindnotifycallback\n",GetTStamp(tBuff,56)));
 
     if(jsNotify)
         AddTrayWindNotifyListener(jsNotify);
@@ -78,8 +78,8 @@
 
 NS_IMETHODIMP rhTray::Unsetwindnotifycallback(rhITrayWindNotify *jsNotify)
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Unsetwindnotifycallback\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Unsetwindnotifycallback\n",GetTStamp(tBuff,56)));
 
     if(jsNotify)
         RemoveTrayWindNotifyListener(jsNotify);
@@ -90,11 +90,10 @@
 /* void add (); */
 NS_IMETHODIMP rhTray::Add(nsIBaseWindow *aWindow)
 {
-    
-
+    char tBuff[56];
     NS_ENSURE_ARG(aWindow);
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Add %p \n",aWindow));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Add %p \n",GetTStamp(tBuff,56),aWindow));
     HRESULT res = Initialize();
     if(res != S_OK)
     {
@@ -112,7 +111,8 @@
 /* void remove (); */
 NS_IMETHODIMP rhTray::Remove(nsIBaseWindow *aWindow)
 {
-     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Remove window %p \n",aWindow));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Remove window %p \n",GetTStamp(tBuff,56),aWindow));
 
     return NS_OK;
 }
@@ -160,14 +160,11 @@
 
     return NS_OK;
 
-
-
 }
 
 /* void hideall (); */
 NS_IMETHODIMP rhTray::Hideall() 
 {
-
     HideAllListeners();
     return NS_OK;
 }
@@ -195,15 +192,16 @@
 /* void settooltipmsg (in string aMessage); */
 NS_IMETHODIMP rhTray::Settooltipmsg(const char *aMessage)
 {
-   PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Settooltipmsg %s  \n",aMessage));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Settooltipmsg %s  \n",GetTStamp(tBuff,56),aMessage));
 
-   if(!aMessage)
-     return E_FAIL;
+    if(!aMessage)
+       return E_FAIL;
 
-   if(strlen(aMessage) >= 64)
+    if(strlen(aMessage) >= 64)
      return E_FAIL;
 
-   strcpy(rhTray::mIconData.szTip, aMessage);
+    strcpy(rhTray::mIconData.szTip, aMessage);
 
    return NS_OK;
 }
@@ -211,24 +209,18 @@
 /* void seticonimage (in string aIcon); */
 NS_IMETHODIMP rhTray::Seticonimage(const char *aIcon)
 {
-
-
     return NS_OK;
 }
 
 /* void hideicon (); */
 NS_IMETHODIMP rhTray::Hideicon(void)
 {
-
-
     return NS_OK;
 }
 
 /* void showicon (); */
 NS_IMETHODIMP rhTray::Showicon(void)
 {
-
-
     return NS_OK;
 }
 
@@ -254,14 +246,13 @@
 
 HRESULT rhTray::Initialize()
 {
-
+    char tBuff[56]; 
     if(mInitialized)
     {
         return S_OK;
     }
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize  \n"));
-
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize  \n",GetTStamp(tBuff,56)));
 
     CreateMutex(NULL, FALSE, "ESCMutex"); 
 
@@ -299,7 +290,7 @@
 
     rhTray::mIconData.uTimeout = 1000;
 
-    PR_LOG(trayLog,PR_LOG_DEBUG,("rhTray::Initialize tray icon handle %d \n",icon));
+    PR_LOG(trayLog,PR_LOG_DEBUG,("%s rhTray::Initialize tray icon handle %d \n",GetTStamp(tBuff,56),icon));
 
 
     ::Shell_NotifyIcon( NIM_ADD, &rhTray::mIconData);
@@ -310,17 +301,18 @@
 
 HRESULT rhTray::RemoveIcon()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveIcon. \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveIcon. \n",GetTStamp(tBuff,56)));
 
     ::Shell_NotifyIcon(NIM_DELETE,&rhTray::mIconData);
 
-
     return S_OK;
 }
 
 HRESULT rhTray::Cleanup()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Cleanup.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Cleanup.\n",GetTStamp(tBuff,56)));
 
     RemoveAllListeners();
     DestroyEventWindow();
@@ -334,7 +326,8 @@
 void rhTray::ShowAllListeners()
 {
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowAllListeners.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ShowAllListeners.\n",GetTStamp(tBuff,56)));
     map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
 
     rhTrayWindowListener *cur = NULL;
@@ -355,10 +348,10 @@
 
 }
 
-
 void rhTray::HideAllListeners()
 {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::HideAllListeners.\n"));
+    char tBuff[56]; 
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::HideAllListeners.\n",GetTStamp(tBuff,56)));
 
     map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
 
@@ -371,7 +364,6 @@
         if(cur)
         {
             cur->HideWindow();
-
         }
 
     }
@@ -381,7 +373,8 @@
 HRESULT rhTray::DestroyEventWindow()
 {
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::DestroyEventWindow \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::DestroyEventWindow \n",GetTStamp(tBuff,56)));
 
     ::DestroyWindow(rhTray::mWnd);
     rhTray::mWnd = 0;
@@ -392,7 +385,8 @@
 HRESULT rhTray::CreateEventWindow()
 {
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::CreateEventWindow \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::CreateEventWindow \n",GetTStamp(tBuff,56)));
     ::SetLastError(0);
     HINSTANCE hInst = ::GetModuleHandle(NULL);
 
@@ -454,8 +448,9 @@
     )
 {
 
+    char tBuff[56];
 
-  switch(aMsg) {
+    switch(aMsg) {
     case WM_USER:
 
        switch(lParam)
@@ -463,14 +458,14 @@
            case WM_LBUTTONDBLCLK:
            case WM_LBUTTONDOWN:
 
-               PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::WindowProc: WM_LBUTTONDBLCLK  \n"));
+               PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::WindowProc: WM_LBUTTONDBLCLK  \n",GetTStamp(tBuff,56)));
                NotifyTrayWindListeners(MENU_EVT,MENU_SHOW);
                ShowAllListeners();
 
            break;
            case WM_RBUTTONDOWN:
 
-                PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::WindowProc: WM_RBUTTONDOWN \n"));
+                PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::WindowProc: WM_RBUTTONDOWN \n",GetTStamp(tBuff,56)));
 
                 HRESULT res = rhTray::ShowPopupMenu (IDR_MENU1);
 
@@ -497,7 +492,7 @@
       break;
     case WM_CREATE:
 
-           PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::WindowProc: WM_CREATE  \n"));
+           PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::WindowProc: WM_CREATE  \n",GetTStamp(tBuff,56)));
        break;
     default:
        break;
@@ -514,10 +509,11 @@
 HRESULT rhTray::AddListener(nsIBaseWindow *aWindow)
 {
 
+    char tBuff[56];
     nsresult rv;
 
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddListener %p \n",aWindow));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddListener %p \n",GetTStamp(tBuff,56),aWindow));
     NS_ENSURE_ARG(aWindow);
 
     nativeWindow aNativeWindow;
@@ -543,7 +539,7 @@
 
     if(already)
     {
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener Window already registered  %p \n",aWindow));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener Window already registered  %p \n",GetTStamp(tBuff,56),aWindow));
         return S_OK;
 
     }
@@ -570,100 +566,95 @@
 
 HRESULT rhTray::ShowPopupMenu (WORD PopupMenuResource)
 {
-  HMENU hMenu, hPopup = 0;
+    char tBuff[56];
+    HMENU hMenu, hPopup = 0;
 
-  const int numMenuItems = 2;
+    const int numMenuItems = 2;
 
-  hMenu = ::LoadMenu (::GetModuleHandle("rhTray.dll"),
+    hMenu = ::LoadMenu (::GetModuleHandle("rhTray.dll"),
                       MAKEINTRESOURCE (PopupMenuResource));
 
-  PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowPopupMenu hMenu %d  error %d\n",hMenu,GetLastError()));
-
-  if (hMenu != 0) {
-    POINT pt;
-    ::GetCursorPos (&pt);
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ShowPopupMenu hMenu %d  error %d\n",GetTStamp(tBuff,56),hMenu,GetLastError()));
 
-    hPopup = ::GetSubMenu (hMenu, 0);
-
-    int numItems = rhTray::mMenuItemStringMap.size();
+    if (hMenu != 0) {
+        POINT pt;
+        ::GetCursorPos (&pt);
 
+        hPopup = ::GetSubMenu (hMenu, 0);
 
+        int numItems = rhTray::mMenuItemStringMap.size();
     
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowPopupMenu num menu item strings : %d\n",numItems));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ShowPopupMenu num menu item strings : %d\n",GetTStamp(tBuff,56),numItems));
     // Change the menu items text if possible
 
-    MENUITEMINFO mii = {0};
+        MENUITEMINFO mii = {0};
  
-    unsigned int menuItemID = 0;
+        unsigned int menuItemID = 0;
 
-    int i = 0;
+        int i = 0;
  
-    if(numItems == numMenuItems)
-    {     
-        for (i = 0 ;i < numMenuItems; i++)
-        {
-             mii.cbSize = sizeof(MENUITEMINFO);
-             mii.fMask = MIIM_TYPE ;
-
-
-
-             char * itemText = (char *) (rhTray::mMenuItemStringMap[i]).c_str();
+        if(numItems == numMenuItems)
+        {     
+            for (i = 0 ;i < numMenuItems; i++)
+            {
+                mii.cbSize = sizeof(MENUITEMINFO);
+                mii.fMask = MIIM_TYPE ;
 
+                char * itemText = (char *) (rhTray::mMenuItemStringMap[i]).c_str();
              
-             PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowPopupMenu menutext: %d text %s \n",i,itemText));
-             if(itemText)
-             {
-
-                 if(i == 0)
-                 {
-                     menuItemID= ID_SHOW;                          
-                 }
-                 else
-                 {
-                      menuItemID= IDM_EXIT;
-
-                 }
-
-                 if( GetMenuItemInfo(hPopup,menuItemID,FALSE,&mii))
-                 {
-                     char *tmpBuff = NULL;
-
-                     tmpBuff = strdup(itemText);
-
-                     mii.cch=strlen(itemText);
-                     mii.dwTypeData=tmpBuff;
-                     SetMenuItemInfo(hPopup,menuItemID,FALSE,&mii);
-
-                     free(tmpBuff);
-                 }
-                 else
-                 {
-                     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowPopupMenu Can't GetMenuItemInfo \n")); 
-
-                 }
-             }
+                PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ShowPopupMenu menutext: %d text %s \n",GetTStamp(tBuff,56),i,itemText));
+               if(itemText)
+               {
+
+                   if(i == 0)
+                   {
+                        menuItemID= ID_SHOW;                          
+                   }
+                   else
+                   {
+                        menuItemID= IDM_EXIT;
+
+                   }
+
+                   if( GetMenuItemInfo(hPopup,menuItemID,FALSE,&mii))
+                   {
+                       char *tmpBuff = NULL;
+
+                       tmpBuff = strdup(itemText);
+
+                       mii.cch=strlen(itemText);
+                       mii.dwTypeData=tmpBuff;
+                       SetMenuItemInfo(hPopup,menuItemID,FALSE,&mii);
+
+                       free(tmpBuff);
+                   }
+                   else
+                   {
+                       PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ShowPopupMenu Can't GetMenuItemInfo \n",GetTStamp(tBuff,56))); 
+                   }
+               }
 
-        }
+          }
 
-    }
+      }
 
-    ::SetForegroundWindow (rhTray::mWnd);
+      ::SetForegroundWindow (rhTray::mWnd);
 
-    WORD cmd = ::TrackPopupMenu (hPopup, TPM_RIGHTBUTTON | TPM_RETURNCMD,
+      WORD cmd = ::TrackPopupMenu (hPopup, TPM_RIGHTBUTTON | TPM_RETURNCMD,
                                  pt.x, pt.y, 0, mWnd, NULL);
 
-    ::PostMessage (mWnd, WM_NULL, 0, 0);
+      ::PostMessage (mWnd, WM_NULL, 0, 0);
 
-    ::DestroyMenu (hMenu);
-    return cmd;
-  }
-  return 0;
+      ::DestroyMenu (hMenu);
+      return cmd;
+    }
+    return 0;
 }
 
 HRESULT rhTray::RemoveListener(nsIBaseWindow *aBaseWindow)
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveWindowListener %p \n",aBaseWindow));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveWindowListener %p \n",GetTStamp(tBuff,56),aBaseWindow));
 
     if(!aBaseWindow)
         return S_OK;
@@ -682,32 +673,27 @@
         }
         
         rhTray::mWindowMap.erase(i);
-
         
     }
 
     return S_OK;
-
 }
 
 HRESULT rhTray::RemoveAllListeners()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveAllListenesr\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveAllListenesr\n",GetTStamp(tBuff,56)));
     map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
 
     rhTrayWindowListener *cur = NULL;
 
     for(i = rhTray::mWindowMap.begin(); i!= rhTray::mWindowMap.end(); i++)
     {
-
         cur = (*i).second;
 
         if(cur)
         {
-
-
-            PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveAllListeners deleting %p\n",cur));
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveAllListeners deleting %p\n",GetTStamp(tBuff,56),cur));
 
             delete cur;
 
@@ -718,23 +704,19 @@
     rhTray::mWindowMap.clear();
     
     return S_OK;
-
 }
 
 /* void setmenuitemtext (in unsigned long aIndex, in string aText); */
 NS_IMETHODIMP rhTray::Setmenuitemtext(PRUint32 aIndex, const char *aText)
 {
+    char tBuff[56]; 
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%sa rhTray::Setmenuitemtext index: %d text: %s\n",GetTStamp(tBuff,56),aIndex, aText));
 
-   
-   PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setmenuitemtext index: %d text: %s\n",aIndex, aText));
-
-   if(aIndex >= 0 && aIndex <= 10 && aText)
-   {
-       rhTray::mMenuItemStringMap[aIndex] = aText;
-
-   }
-
+    if(aIndex >= 0 && aIndex <= 10 && aText)
+    {
+        rhTray::mMenuItemStringMap[aIndex] = aText;
 
+    }
 
     return S_OK;
 }
@@ -744,7 +726,7 @@
 
 rhITrayWindNotify* rhTray::GetTrayWindNotifyListener(rhITrayWindNotify *listener)
 {
-
+    char tBuff[56];
     std::list<nsCOMPtr<rhITrayWindNotify> >::const_iterator it;
 
     for(it=gTrayWindNotifyListeners.begin(); it!=gTrayWindNotifyListeners.end(); ++it) {
@@ -755,40 +737,34 @@
     }
 }
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::GetNotifyKeyListener:  looking for %p returning NULL. \n",listener));
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetNotifyKeyListener:  looking for %p returning NULL. \n",GetTStamp(tBuff,56),listener));
 
     return nsnull;
-
 }
 
 int rhTray::GetTrayWindNotifyListSize()
 {
     return gTrayWindNotifyListeners.size();
-
 }
 void rhTray::AddTrayWindNotifyListener(rhITrayWindNotify *listener)
 {
-
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddTrayWindNotifyListener: %p \n",
-listener));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddTrayWindNotifyListener: %p \n", GetTStamp(tBuff,56),listener));
 
     if(GetTrayWindNotifyListener(listener ))
     {
 
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddTrayWindNotifyListener: %p listener already in list. \n",listener));
-
-         return ;
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddTrayWindNotifyListener: %p listener already in list. \n",GetTStamp(tBuff,56),listener));
+        return ;
 
     }
 
     gTrayWindNotifyListeners.push_back(listener);
 
-
 }
 
 void rhTray::RemoveTrayWindNotifyListener(rhITrayWindNotify *listener)
 {
-
     if(!GetTrayWindNotifyListener(listener))
     {
         return;
@@ -825,7 +801,6 @@
 
         ((rhITrayWindNotify *) (*it))->RhTrayWindEventNotify(aEvent,aEventData, aKeyData, aData1, aData2, &claimed);
 
-
     }
 
 }
@@ -842,8 +817,8 @@
 
 rhTrayWindowListener::~rhTrayWindowListener()
 {
-
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::~rhTrayWindowListener.\n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::~rhTrayWindowListener.\n",GetTStamp(tBuff,56)));
 
     Cleanup();
 
@@ -857,7 +832,7 @@
     LPARAM lParam
     )
 {
-
+    char tBuff[56];
     WNDPROC wndProc = (WNDPROC) NULL; 
 
     int eventClaimed = 0;
@@ -875,7 +850,6 @@
     else
     {
         wndProc = me->origWindowProc;
-
     }
 
     switch(aMsg) {
@@ -884,23 +858,23 @@
             {
                 case HTMINBUTTON:
 
-                     if(me)
-                     {
-                         //me->HideWindow();
-                     }
+                    if(me)
+                    {
+                        //me->HideWindow();
+                    }
 
-                    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener Minimize\n"));
+                    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener Minimize\n",GetTStamp(tBuff,56)));
                      //eventClaimed = 1;
                 break;
 
                 case HTMAXBUTTON:
-                    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: Maximize  \n"));
+                    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: Maximize  \n",GetTStamp(tBuff,56)));
                     //eventClaimed = 1;
                 break;
                  
                 case HTCLOSE:
 
-                    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener Close! \n"));
+                    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener Close! \n",GetTStamp(tBuff,56)));
 
                     if(me)
                     {
@@ -921,7 +895,7 @@
                  case WA_ACTIVE:
                  case WA_CLICKACTIVE:
 
-                     PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener ACTIVATE! \n"));
+                     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener ACTIVATE! \n",GetTStamp(tBuff,56)));
 
                      
                  break;
@@ -945,17 +919,13 @@
         }
 
 
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener WM_SHOWWINDOW wParam %d lParam %d! \n",wParam, lParam));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener WM_SHOWWINDOW wParam %d lParam %d! \n",GetTStamp(tBuff,56),wParam, lParam));
 
         show = (int) wParam;
 
-
         if(lParam == 0)
         {    
-
-                  PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener  WM_SHOW called from ShowWindow or HideWindow \n"));
-
-
+            PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener  WM_SHOW called from ShowWindow or HideWindow \n",GetTStamp(tBuff,56)));
         }
 
         break;
@@ -964,8 +934,7 @@
             switch(wParam)
             {
                 case SC_CLOSE:
-
-                    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: WM_SYSCOMMAND SC_CLOSE  \n"));
+                    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: WM_SYSCOMMAND SC_CLOSE  \n",GetTStamp(tBuff,56)));
                 break;
 
                 default:
@@ -979,7 +948,7 @@
             {
                 case SIZE_MINIMIZED:
 
-                    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::  WM_SIZE SIZE_MINIMIZE \n"));
+                    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::  WM_SIZE SIZE_MINIMIZE \n",GetTStamp(tBuff,56)));
 
                 break;
                 default:
@@ -993,24 +962,25 @@
 
     };
 
-  if(eventClaimed)
-  {
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: Event claimed \n"));
-    return FALSE;
-  }
+    if(eventClaimed)
+    {
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: Event claimed \n",GetTStamp(tBuff,56)));
+        return FALSE;
+    }
 
-  return ::CallWindowProc(
-    wndProc,
-    hwnd,
-    aMsg,
-    wParam,
-    lParam);
+    return ::CallWindowProc(
+        wndProc,
+        hwnd,
+        aMsg,
+        wParam,
+        lParam);
 }
 
 HRESULT rhTrayWindowListener::Cleanup()
 {
 
-    PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::Cleanup. \n"));
+    char tBuff[56];
+    PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::Cleanup. \n",GetTStamp(tBuff,56)));
 
     return S_OK;
 
@@ -1032,9 +1002,10 @@
 
 void rhTrayWindowListener::ShowWindow()
 {
+    char tBuff[56];
     if(mWnd)
     {
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow \n"));
+         PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: ShowWindow \n",GetTStamp(tBuff,56)));
          //::ShowWindow(mWnd,SW_SHOW);
 
          //::ShowWindow(mWnd,SW_RESTORE);
@@ -1045,10 +1016,11 @@
 
 void rhTrayWindowListener::HideWindow()
 {
+    char tBuff[56];
     if(mWnd)
     {
 
-        PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: Hide Window \n"));
+        PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: Hide Window \n",GetTStamp(tBuff,56)));
 
         ::ShowWindow(mWnd,SW_HIDE);
 
@@ -1056,7 +1028,7 @@
 
         ::SetWindowLongPtr(mWnd,GWL_EXSTYLE,GetWindowLongPtr(mWnd,GWL_STYLE) | WS_EX_TOOLWINDOW);
 
-         PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: Hide Window , try to hide owner window too. \n"));
+         PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: Hide Window , try to hide owner window too. \n",GetTStamp(tBuff,56)));
         ::ShowWindow(mWnd,SW_HIDE);
 
     }



From fedora-directory-commits at redhat.com  Sat Feb 24 02:06:25 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:06:25 -0500
Subject: [Fedora-directory-commits] esc/src/app/xpcom/tray rhTray.h,1.3,1.4
Message-ID: <200702240206.l1O26PZU001728@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1712

Modified Files:
	rhTray.h 
Log Message:
Add utility func to add a time stamp to a log message.



Index: rhTray.h
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhTray.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rhTray.h	25 Oct 2006 03:59:03 -0000	1.3
+++ rhTray.h	24 Feb 2007 02:06:23 -0000	1.4
@@ -25,7 +25,24 @@
 #include "nsCOMPtr.h"
 #include "widget/nsIBaseWindow.h"
 #include "widget/nsIWidget.h"
+#include <time.h>
 
+extern "C" {
+//Utility function to get Time Stamp
+    char *GetTStamp(char *aTime,int aSize)
+    {
+        if(!aTime)
+            return NULL;
+        int maxSize = 55;
+        if(aSize < maxSize)
+            return NULL;
+        char *tFormat = "[%c]";
+        time_t tm = time(NULL);
+        struct tm *ptr = localtime(&tm);
+        strftime(aTime ,maxSize ,tFormat,ptr);
+        return aTime;
+    }
+}
 
 // Event Defines
 #define MENU_EVT        1



From fedora-directory-commits at redhat.com  Sat Feb 24 02:07:51 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:07:51 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	ESC.js, 1.6, 1.7
Message-ID: <200702240207.l1O27pdC001763@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1741

Modified Files:
	ESC.js 
Log Message:
Issue some log messages to be written to the NSPR log file.



Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ESC.js	9 Feb 2007 21:48:07 -0000	1.6
+++ ESC.js	24 Feb 2007 02:07:49 -0000	1.7
@@ -70,6 +70,20 @@
 const HIDDEN_WINDOW      = "hiddenWindow.xul";
 const SECURITY_WINDOW    = "security.xul";
 
+
+//Log level constants
+
+const   PR_LOG_NONE = 0;
+const   PR_LOG_ALWAYS = 1;
+const   PR_LOG_ERROR = 2;
+const   PR_LOG_WARNING = 3;
+const   PR_LOG_DEBUG = 4;
+
+const   PR_LOG_NOTICE = 4;
+const   PR_LOG_WARN =   3;
+const   PR_LOG_MIN =    4;
+const   PR_LOG_MAX =    4; 
+
 function getUIForKey(aKeyID)
 {
     return keyUITable[aKeyID];
@@ -206,6 +220,7 @@
 
 function DoPhoneHome(keyType,keyID)
 {
+  CoolKeyLogMsg(PR_LOG_ALWAYS,"Attempting to phone home for Key " + keyID); 
   var callback = function (aResult) {
 
     recordMessage("In DoPhoneHome callback");
@@ -217,6 +232,7 @@
         if(!issuer)
             issuer = getBundleString("unknownIssuer");
         TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
+        LogKeyInfo(keyType,keyID,"Key Inserted ...");
         UpdateRowWithPhoneHomeData(keyType,keyID);
         recordMessage("cached issuer " + issuer);
         var browserURL =  GetCachedEnrolledTokenBrowserURL(keyID);
@@ -233,6 +249,7 @@
     {
         issuer = getBundleString("unknownIssuer");
         TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
+        LogKeyInfo(keyType,keyID,"Key Inserted ...");
     }
   }
 
@@ -249,6 +266,7 @@
       recordMessage("Phone home info cached...");
       issuer = GetCachedIssuer(keyID);
       TraySendNotificationMessage(getBundleString("keyInserted"),"\"" + issuer +"\"" + " " + getBundleString("keyInsertedComputer"),3,4000,GetESCNotifyIconPath(keyType,keyID));
+      LogKeyInfo(keyType,keyID,"Key Inserted ...");
 
       var launchBrowserURL =  GetCachedEnrolledTokenBrowserURL(keyID);
 
@@ -487,7 +505,7 @@
 
 
             } catch(e) {
-                MyAlert(getBundleString("errorSetDataValue") + e);
+                //MyAlert(getBundleString("errorSetDataValue") + e);
             }
         }
 
@@ -852,6 +870,18 @@
   }
 }
 
+function CoolKeyLogMsg(aLogLevel,aMessage)
+{
+    if(!aMessage)
+        return;
+
+    try { 
+         netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+         netkey.CoolKeyLogMsg(aLogLevel,aMessage);
+         } catch(e) {
+         }
+}
+
 function ChallengeCoolKey(keyType, keyID, data)
 {
   try {
@@ -973,10 +1003,14 @@
 {
   var image_src = "";
 
-  if(observeBusy && (keyStatus == "BUSY" || keyStatus == "UNAVAILABLE"))
+  if(observeBusy && (keyStatus == "BUSY" ))
   {
       return "throbber-anim5.gif";
   }
+  if(keyStatus == "UNAVAILABLE")
+  {
+      return "";
+  }
   if(keyStatus == "ENROLLED")
   {
       image_src = "enrolled-key";
@@ -1982,6 +2016,8 @@
         keyStatus = GetStatusForKeyID(keyType, keyID);
 
 
+    recordMessage("No Key: " + noKey + " status " + keyStatus);
+
     var passwordArea = document.getElementById("password-area-id");
 
     if(passwordArea)
@@ -2029,6 +2065,7 @@
 
     var image_src = SelectImageForKeyStatus(keyStatus,1,1);
 
+    recordMessage("image_src " + image_src);
     if(!image_src)
         HideItem(detailsImage);
     else
@@ -2057,7 +2094,8 @@
       DisableItem(resetpinbtn);
       DisableItem(formatbtn);
       detailsKeyLabel.setAttribute("value",getBundleString("noKeysPresent"));
-       return;
+      HideItem(detailsImage);
+      return;
    }
 
    if(keyStatus == "ENROLLED")
@@ -2613,12 +2651,19 @@
 
   var  row = GetRowForKey(keyType, keyID);
 
+
   if(gHiddenPage)
   {
+      if(curChildWindow)
+      {
+          curChildWindow.close();
+          curChildWindow = null;
+      }
       var issuer = GetCachedIssuer(keyID);
       if(!issuer)
           issuer = getBundleString("unknownIssuer");
       TraySendNotificationMessage(getBundleString("keyRemoved"),"\"" + issuer + "\"" + " " + getBundleString("keyRemovedComputer"),1,4000,GetESCNotifyIconPath(keyType,keyID));
+       LogKeyInfo(keyType,keyID, "Key Removed ...");
 
   }
 
@@ -3531,19 +3576,30 @@
     phoneHomeUrl = GetCachedPhoneHomeURL(aKeyID);
 
     if(!phoneHomeUrl)
+    {
+        CoolKeyLogMsg(PR_LOG_ALWAYS,"IsPhoneHomeCached keyID:  " + aKeyID + " IsCached: false " );
         return false;
+    }
 
     phoneHomeIssuer = GetCachedIssuer(aKeyID);
 
     if(!phoneHomeIssuer)
+    {
+       CoolKeyLogMsg(PR_LOG_ALWAYS,"IsPhoneHomeCached keyID:  " + aKeyID + " IsCached: false " );
        return false;
+    }
 
     tpsURL = GetCachedTPSURL(aKeyID);
 
     if(!tpsURL)
+    {
+        CoolKeyLogMsg(PR_LOG_ALWAYS,"IsPhoneHomeCached keyID:  " + aKeyID + " IsCached: false " );
         return false;
+    }
+
     tpsUI = GetCachedTPSUI(aKeyID);
 
+    CoolKeyLogMsg(PR_LOG_ALWAYS,"IsPhoneHomeCached keyID:  " + aKeyID + " IsCached: true " );
     return true;
 }
 
@@ -3645,6 +3701,36 @@
      return url;
 }
 
+//Log information about the key
+
+function LogKeyInfo(aKeyType,aKeyID,aMessage)
+{
+    var issuer = GetCachedIssuer(aKeyID);
+    var status =  GetStatusForKeyID(aKeyType, aKeyID);
+    var atr =     DoCoolKeyGetATR(aKeyType,aKeyID);
+    var tpsURI = GetCachedTPSURL(aKeyID);
+    var tpsUI  = GetCachedTPSUI(aKeyID);
+    var phoneHomeURI = GetCachedPhoneHomeURL(aKeyID);
+
+    if(aMessage)
+        CoolKeyLogMsg(PR_LOG_ALWAYS,aMessage);
+
+    CoolKeyLogMsg(PR_LOG_ALWAYS,"CoolKey ID: " + aKeyID);
+
+    if(issuer)
+        CoolKeyLogMsg(PR_LOG_ALWAYS,"CoolKey Issuer: " + issuer);
+
+    if(status)
+        CoolKeyLogMsg(PR_LOG_ALWAYS,"CoolKey Status: " + status);
+
+    if(atr)
+        CoolKeyLogMsg(PR_LOG_ALWAYS,"CoolKey Atr: " + atr);
+
+    if(phoneHomeURI)
+        CoolKeyLogMsg(PR_LOG_ALWAYS,"CoolKey Phone Home URI: " + phoneHomeURI);
+}
+
+
 //Update display when phone home data comes in
 function UpdateRowWithPhoneHomeData(keyType,keyID)
 {
@@ -3664,6 +3750,7 @@
 function phoneHome(theUrl,aKeyID,resultCB)
 {
 
+   CoolKeyLogMsg(PR_LOG_ALWAYS,"Actually phoning Home for Key: " + aKeyID + " URI: " + theUrl); 
    var url = null ;
 
    if(!theUrl || !aKeyID)
@@ -3756,6 +3843,8 @@
                     {
                         recordMessage("Writing out config : " +cValue + " value: " + value);
                         DoCoolKeySetConfigValue(cValue,value);
+                        CoolKeyLogMsg(PR_LOG_ALWAYS,"Phone Home config value for Key: " + aKeyID + " ConfigKey: " + cValue + " ConfigValue: " + value);
+
                     }
                 }
                
@@ -3779,6 +3868,7 @@
 
                 var issuer_config_value = ConfigValueWithKeyID(aKeyID,KEY_ISSUER_URL);
                 var result = DoCoolKeySetConfigValue(issuer_config_value,url);
+                CoolKeyLogMsg(PR_LOG_ALWAYS,"Phone Home config value for Key: " + aKeyID + " ConfigKey: " + issuer_config_value + " ConfigValue: " + url);
                 resultCB(true);
             }
             return true;



From fedora-directory-commits at redhat.com  Sat Feb 24 02:10:48 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:10:48 -0500
Subject: [Fedora-directory-commits] 
	esc/src/lib/NssHttpClient engine.cpp, 1.3, 1.4
Message-ID: <200702240210.l1O2AmjG001879@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/NssHttpClient
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1861

Modified Files:
	engine.cpp 
Log Message:
Fix code responsible for closing the connection socket either by client request or when a connection is dropped.



Index: engine.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/engine.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- engine.cpp	9 Feb 2007 21:56:36 -0000	1.3
+++ engine.cpp	24 Feb 2007 02:10:45 -0000	1.4
@@ -420,6 +420,12 @@
 void Engine::CloseConnection()
 {
     connectionClosed = true;
+
+    if(_sock)
+    {
+        PR_Close(_sock);
+        _sock = NULL;
+    }
 }
 /**
  * Returns a file descriptor for I/O if the HTTP connection is successful
@@ -567,13 +573,12 @@
     char *nickName = request.getCertNickName();
 
     char *serverName = (char *)server.getAddr();
-    sock = _doConnect( &addr, request.isSSL(), 0, 0,nickName, 0, serverName );
+    _sock = _doConnect( &addr, request.isSSL(), 0, 0,nickName, 0, serverName );
 
-    if ( sock != NULL) {
-        _sock = sock;
-        PRBool status = request.send( sock );
+    if ( _sock != NULL) {
+        PRBool status = request.send( _sock );
         if ( status ) {
-            resp = new PSHttpResponse( sock, &request, timeout, expectChunked ,this);
+            resp = new PSHttpResponse( _sock, &request, timeout, expectChunked ,this);
             response_code = resp->processResponse(processStreamed);
 
             if(!response_code)
@@ -583,18 +588,17 @@
                     delete resp;
                     resp = NULL;
                 }
-                if( sock != NULL ) {
-                    PR_Close( sock );
-                    sock = NULL;
+                if( _sock != NULL ) {
+                    PR_Close( _sock );
+                    _sock = NULL;
                 }
 
                 return NULL;
 
             }
         }
-        if( sock != NULL ) {
-            PR_Close( sock );
-            sock = NULL;
+        if( _sock != NULL ) {
+            PR_Close( _sock );
             _sock  = NULL;
         }
     }



From fedora-directory-commits at redhat.com  Sat Feb 24 02:11:34 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:11:34 -0500
Subject: [Fedora-directory-commits] esc/src/lib/NssHttpClient http.h, 1.2,
	1.3
Message-ID: <200702240211.l1O2BY9G001908@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/NssHttpClient
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1892

Modified Files:
	http.h 
Log Message:
Add prototype for utility function needed to get time stamps for log messages.



Index: http.h
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/http.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- http.h	27 Sep 2006 17:49:21 -0000	1.2
+++ http.h	24 Feb 2007 02:11:31 -0000	1.3
@@ -40,6 +40,13 @@
 #define __EXPORT
 #endif
 
+extern "C" {
+
+char *GetTStamp(char *aTime,int aSize);
+
+}
+
+
 typedef bool ( *PSChunkedResponseCallback)(unsigned char *entity_data,unsigned entity_data_len,void *uw, int status);
 
 class PSHttpResponse;



From fedora-directory-commits at redhat.com  Sat Feb 24 02:12:17 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:12:17 -0500
Subject: [Fedora-directory-commits] esc/src/lib/NssHttpClient request.cpp,
	1.2, 1.3
Message-ID: <200702240212.l1O2CHhE001943@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/NssHttpClient
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1926

Modified Files:
	request.cpp 
Log Message:
Add time stamps to log messages.



Index: request.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/request.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- request.cpp	27 Sep 2006 17:49:21 -0000	1.2
+++ request.cpp	24 Feb 2007 02:12:15 -0000	1.3
@@ -24,7 +24,7 @@
 #include "request.h"
 #include "engine.h"
 #include <prlog.h>
-
+#include <time.h>
 PRLogModuleInfo *httpLog = PR_NewLogModule("coolKeyHttpReq");
 
 /**
@@ -249,6 +249,7 @@
 
 PRBool PSHttpRequest::send( PRFileDesc *sock ) {
     const char *hostname;
+    char tBuff[56];
 
     PRBool rv = PR_FALSE;
     if (!sock) {
@@ -319,7 +320,7 @@
     data = PR_sprintf_append(data,"\r\n");
 
     PR_LOG( httpLog, PR_LOG_DEBUG, 
-                       ("PSHttpRequest::PSHttpRequest: data %s\n",data));
+                       ("%s PSHttpRequest::PSHttpRequest: data %s\n",GetTStamp(tBuff,56),data));
 
     int len = PL_strlen(data);
     //send the data ..



From fedora-directory-commits at redhat.com  Sat Feb 24 02:12:58 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:12:58 -0500
Subject: [Fedora-directory-commits] esc/src/lib/NssHttpClient response.cpp,
	1.2, 1.3
Message-ID: <200702240212.l1O2CwAE001978@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/NssHttpClient
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1962

Modified Files:
	response.cpp 
Log Message:
Add time stamps to log messages.



Index: response.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/response.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- response.cpp	27 Sep 2006 17:49:21 -0000	1.2
+++ response.cpp	24 Feb 2007 02:12:56 -0000	1.3
@@ -25,6 +25,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <math.h>
+#include <time.h>
 #include "nspr.h"
 
 
@@ -39,7 +40,6 @@
 
 PRLogModuleInfo *httpRespLog = PR_NewLogModule("coolKeyHttpRes");
 
-
 /**
  * Constructor. This class is used by  the HttpResponse class for reading and
  * processing data from the socket
@@ -92,7 +92,8 @@
 
     int num =1;
     int i =0;
-    
+   
+    char tBuff[56]; 
     PRBool endChunk= PR_FALSE;
 
     // actual reading from the socket happens here
@@ -106,12 +107,12 @@
                        _timeout );
 
         PR_LOG( httpRespLog, PR_LOG_DEBUG, 
-                              ("RecvBuf::_getBytes:: read  %d bytes\n",num));
+                              ("%s RecvBuf::_getBytes:: read  %d bytes\n",GetTStamp(tBuff,56),num));
 
         if(num < 0)
         {
             PR_LOG( httpRespLog, PR_LOG_DEBUG, 
-                              ("RecvBuf::_getBytes:: Conn Closed "));
+                              ("%s RecvBuf::_getBytes:: Conn Closed ",GetTStamp(tBuff,56)));
             return PR_FALSE;
         }
 
@@ -247,6 +248,7 @@
  * @returns - the next char from the data
  */
 char RecvBuf::getChar() {
+    char tBuff[56];
     if (!_chunkedMode)
         return _getChar();
 
@@ -270,7 +272,7 @@
                 if (ch != '\r' || ch2 != '\n')
                 {
                      PR_LOG(httpRespLog, PR_LOG_DEBUG,
-                          ("did not find chunk trailer at end of chunk .  \n"));
+                          ("%s did not find chunk trailer at end of chunk .  \n",GetTStamp(tBuff,56)));
                 }
             }
        
@@ -305,7 +307,7 @@
                 if (ch1 != '\r' || ch2 != '\n')
                 {
                     PR_LOG(httpRespLog, PR_LOG_DEBUG,
-                          ("did not find chunk trailer at the end of chunk . ch1 %c ch2 %c  \n",ch1,ch2));
+                          ("%s did not find chunk trailer at the end of chunk . ch1 %c ch2 %c  \n",GetTStamp(tBuff,56),ch1,ch2));
                 };
 
                 _currentChunkSize = _currentChunkBytesRead = 0;
@@ -667,7 +669,7 @@
 PRBool    PSHttpResponse::_handleChunkedConversation(RecvBuf &buf)
 {
     char ch = 0;
-
+    char tBuff[56];
     char chunk[4096];
 
     int i = 0;
@@ -681,15 +683,15 @@
     }
 
     PR_LOG(httpRespLog, PR_LOG_DEBUG, 
-                          ("PSHttpResponse::_handleChunkedConversation  \n"));
+                          ("%s PSHttpResponse::_handleChunkedConversation  \n",GetTStamp(tBuff,56)));
 
     while(1)
     {
         if(_client && _client->isConnectionClosed())
         {
             PR_LOG(httpRespLog, PR_LOG_DEBUG, 
-                   ("PSHttpResponse::_handleChunkedConversation  client"
-                    " claims conn closed!\n"));
+                   ("%s PSHttpResponse::_handleChunkedConversation  client"
+                    " claims conn closed!\n",GetTStamp(tBuff,56)));
 
             chunk[0] = 0;
             i = 0;
@@ -704,14 +706,14 @@
         if(ch == -1)
         {
              PR_LOG(httpRespLog, PR_LOG_DEBUG, 
-                    ("PSHttpResponse::_handleChunkedConversation getChar"
-                     " returned -1 ! \n"));
+                    ("%s PSHttpResponse::_handleChunkedConversation getChar"
+                     " returned -1 ! \n",GetTStamp(tBuff,56)));
             chunk[i] = 0;
             if(i >= 0)
             {
                 PR_LOG(httpRespLog, PR_LOG_DEBUG, 
-                       ("PSHttpResponse::_handleChunkedConversation"
-                        "  chunk complete EOF condition. chunk: %s\n",(char *) chunk));
+                       ("%s PSHttpResponse::_handleChunkedConversation"
+                        "  chunk complete EOF condition. chunk: %s\n",GetTStamp(tBuff,56),(char *) chunk));
                 (*cb)((unsigned char *) chunk,i,uw,HTTP_CHUNKED_EOF);
 
                 chunk[0] = 0;
@@ -728,8 +730,8 @@
             if(i > 0)
             {
                 PR_LOG(httpRespLog, PR_LOG_DEBUG,
-                       ("PSHttpResponse::_handleChunkedConversation"
-                        "  chunk complete normal condition. chunk: %s\n",(char *) chunk));
+                       ("%s PSHttpResponse::_handleChunkedConversation"
+                        "  chunk complete normal condition. chunk: %s\n",GetTStamp(tBuff,56),(char *) chunk));
                 (*cb)((unsigned char *) chunk,i,uw,HTTP_CHUNK_COMPLETE);
             }
             



From fedora-directory-commits at redhat.com  Sat Feb 24 02:14:09 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:14:09 -0500
Subject: [Fedora-directory-commits] esc/src/lib/coolkey CoolKey.cpp,1.4,1.5
Message-ID: <200702240214.l1O2E90p002007@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1991

Modified Files:
	CoolKey.cpp 
Log Message:
Add time stamps to log messages and handle cancelled operation better.



Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoolKey.cpp	9 Feb 2007 22:00:37 -0000	1.4
+++ CoolKey.cpp	24 Feb 2007 02:14:07 -0000	1.5
@@ -32,6 +32,7 @@
 #include <list>
 #include <algorithm>
 #include <prlog.h>
+#include <time.h>
 #include "CoolKey.h"
 static NSSManager* g_NSSManager = NULL;
 
@@ -42,57 +43,56 @@
 struct ActiveKeyNode;
 
 HRESULT AddNodeToActiveKeyList(ActiveKeyNode *aNode);
-//extern HRESULT RemoveKeyFromActiveKeyList(const CoolKey *aKey);
 HRESULT ClearActiveKeyList(void);
 ActiveKeyNode *GetNodeInActiveKeyList(const CoolKey *aKey);
 
-
-
 COOLKEY_API HRESULT CoolKeyInit(const char *aAppDir)
 {
+    char tBuff[56];
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit: appDir %s \n",aAppDir));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyInit: appDir %s \n",GetTStamp(tBuff,56),aAppDir));
 
-  if (g_NSSManager) 
-  {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyInit:g_NSSManager already exists. \n"));
-    return E_FAIL;
-  }
+    if (g_NSSManager) 
+    {
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ( "%s CoolKeyInit:g_NSSManager already exists. \n",GetTStamp(tBuff,56)));
+        return E_FAIL;
+    }
 
-  InitCoolKeyList();
+    InitCoolKeyList();
 
-  g_NSSManager = new NSSManager();
+    g_NSSManager = new NSSManager();
   
-  if (!g_NSSManager) 
-  {
-    PR_LOG( coolKeyLog, PR_LOG_ERROR, ("CoolKeyInit:Failed to create NSSManager.\n"));
-    return E_FAIL;
-  }
+    if (!g_NSSManager) 
+    {
+      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s CoolKeyInit:Failed to create NSSManager.\n",GetTStamp(tBuff,56)));
+      return E_FAIL;
+    }
   
-  HRESULT rv = g_NSSManager->InitNSS(aAppDir);
-  if (rv == E_FAIL)
-  {
-       PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Failed to initialize Crypto library! \n"));
-       return rv;
-  }
+    HRESULT rv = g_NSSManager->InitNSS(aAppDir);
+    if (rv == E_FAIL)
+    {
+         PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Failed to initialize Crypto library! \n",GetTStamp(tBuff,56)));
+         return rv;
+    }
 
-  return S_OK;
+    return S_OK;
 }
 
 COOLKEY_API HRESULT CoolKeyShutdown()
 { 
+    char tBuff[56];
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyShutdown:\n"));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyShutdown:\n",GetTStamp(tBuff,56)));
 
-  DestroyCoolKeyList();
+    DestroyCoolKeyList();
  
-  if (g_NSSManager) {
-    g_NSSManager->Shutdown();
-    delete g_NSSManager;
-    g_NSSManager = 0;
-  }
+    if (g_NSSManager) {
+        g_NSSManager->Shutdown();
+        delete g_NSSManager;
+        g_NSSManager = 0;
+    }
 
-  return S_OK;
+    return S_OK;
 }
 
 static CoolKeyDispatch g_Dispatch = NULL;
@@ -107,23 +107,20 @@
 	CoolKeyReference reference, CoolKeyRelease release,
         CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue)
 {
-   g_Dispatch = dispatch;
-   g_Reference = reference;
-   g_Release = release;
-   g_GetConfigValue = getconfigvalue;
-   g_SetConfigValue = setconfigvalue;
-
-
+    g_Dispatch = dispatch;
+    g_Reference = reference;
+    g_Release = release;
+    g_GetConfigValue = getconfigvalue;
+    g_SetConfigValue = setconfigvalue;
 
-   char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.disable.password.prompt");
+    char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.disable.password.prompt");
 
-
-   if(suppressPINPrompt && !strcmp(suppressPINPrompt,"yes"))
-   {
-       PK11_SetPasswordFunc( CoolKeyVerifyPassword);
-   }
-   // Set the verify password callback here, no params needed we know what it is
-   return 0;
+    if(suppressPINPrompt && !strcmp(suppressPINPrompt,"yes"))
+    {
+        PK11_SetPasswordFunc( CoolKeyVerifyPassword);
+    }
+    // Set the verify password callback here, no params needed we know what it is
+    return 0;
 }
 
 #define REFERENCE_LISTENER(list) \
@@ -138,246 +135,247 @@
 
 char *CoolKeyVerifyPassword(PK11SlotInfo *slot,PRBool retry,void *arg)
 {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyVerifyPassword: \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyVerifyPassword: \n",GetTStamp(tBuff,56)));
     return NULL;
 }
 
 COOLKEY_API HRESULT CoolKeyRegisterListener(CoolKeyListener* aListener)
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyRegisterListener: aListener %p\n",aListener));
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyRegisterListener: aListener %p\n",GetTStamp(tBuff,56),aListener));
 
+    if (!aListener)
+        return -1;
 
-  if (!aListener)
-    return -1;
-
-  REFERENCE_LISTENER(aListener);
-  g_Listeners.push_back(aListener);
+    REFERENCE_LISTENER(aListener);
+    g_Listeners.push_back(aListener);
   
-  return 0;
+    return 0;
 }
 
 COOLKEY_API HRESULT CoolKeyUnregisterListener(CoolKeyListener* aListener)
 {
-
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyUnregisterListener:\n"));
-  if (!aListener)
-    return -1;
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyUnregisterListener:\n",GetTStamp(tBuff,56)));
+    if (!aListener)
+      return -1;
   
-  std::list<CoolKeyListener*>::iterator it = 
+    std::list<CoolKeyListener*>::iterator it = 
                    find(g_Listeners.begin(), g_Listeners.end(), aListener);
   
-  if (it != g_Listeners.end()) {
-
-      PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
-             ("CoolKeyUnregisterListener: erasing listener %p \n",*it));
-      g_Listeners.erase(it);
-      RELEASE_LISTENER(aListener);
-  }
-  return 0;
-}
-
+    if (it != g_Listeners.end()) {
 
-HRESULT CoolKeyNotify(const CoolKey *aKey, CoolKeyState aKeyState,
-                                                int aData,const char *strData)
-{
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
-        ("CoolKeyNotify: key %s state %d data %d strData %s",
-	 aKey->mKeyID,aKeyState,aData,strData));
-
-  std::list<CoolKeyListener*>::iterator it;
-  for(it=g_Listeners.begin(); it!=g_Listeners.end(); ++it)
-  {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
-          ("CoolKeyNotify: About to notify listener %p",*it));
-
-    if (g_Dispatch) {
-    	(*g_Dispatch)(*it, aKey->mKeyType, aKey->mKeyID,
-		 aKeyState, aData, strData);
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
+             ("%s CoolKeyUnregisterListener: erasing listener %p \n",GetTStamp(tBuff,56),*it));
+        g_Listeners.erase(it);
+        RELEASE_LISTENER(aListener);
     }
-  }
-
-  return S_OK;
+    return 0;
 }
 
 struct BlinkTimerParams
 {
-  BlinkTimerParams(const CoolKey *aKey) : mKey(*aKey), mSlot(0), mRate(0),
+    BlinkTimerParams(const CoolKey *aKey) : mKey(*aKey), mSlot(0), mRate(0),
                                          mEnd(0), mThread(0), mActive(false)
-  {
-  }
+    {
+    }
 
-  ~BlinkTimerParams()
-  {
-    mActive = false;
+    ~BlinkTimerParams()
+    {
+        mActive = false;
 
-    if (mThread && mThread != PR_GetCurrentThread())
-      PR_JoinThread(mThread);
-  }
+        if (mThread && mThread != PR_GetCurrentThread())
+        PR_JoinThread(mThread);
+    }
 
-  AutoCoolKey mKey;
-  PK11SlotInfo *mSlot;
-  unsigned long mRate;
-  PRIntervalTime mEnd;
-  PRThread *mThread;
-  bool mActive;
+    AutoCoolKey mKey;
+    PK11SlotInfo *mSlot;
+    unsigned long mRate;
+    PRIntervalTime mEnd;
+    PRThread *mThread;
+    bool mActive;
 };
 
 struct ActiveKeyNode
 {
-  ActiveKeyNode(const CoolKey *aKey) : mKey(*aKey)
-  {
-  }
+    ActiveKeyNode(const CoolKey *aKey) : mKey(*aKey)
+    {
+    }
 
-  virtual ~ActiveKeyNode()
-  {
-  }
+    virtual ~ActiveKeyNode()
+    {
+    }
 
-  virtual HRESULT OnRemoval() = 0;
+    virtual HRESULT OnRemoval() = 0;
 
-  AutoCoolKey mKey;
+    AutoCoolKey mKey;
 };
 
 struct ActiveKeyHandler : public ActiveKeyNode
 {
-  ActiveKeyHandler(const CoolKey *aKey, CoolKeyHandler *aHandler)
-    : ActiveKeyNode(aKey)
-  {
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG,
-          ("ActiveKeyHandler::ActiveKeyHandler  \n"));
+    ActiveKeyHandler(const CoolKey *aKey, CoolKeyHandler *aHandler)
+         : ActiveKeyNode(aKey)
+    {
+        char tBuff[56];
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG,
+          ("%s ActiveKeyHandler::ActiveKeyHandler  \n",GetTStamp(tBuff,56)));
 
-    assert(aHandler);
-    mHandler = aHandler;
-    mHandler->AddRef();
-  }
+        assert(aHandler);
+        mHandler = aHandler;
+        mHandler->AddRef();
+    }
 
-  ~ActiveKeyHandler()
-  {
-    if (mHandler)
+    ~ActiveKeyHandler()
     {
-        PR_LOG( coolKeyLog, PR_LOG_DEBUG,
-          ("ActiveKeyHandler::~ActiveKeyHandler  \n"));
+        char tBuff[56];
+        if (mHandler)
+        {
+            PR_LOG( coolKeyLog, PR_LOG_DEBUG,
+                ("%s ActiveKeyHandler::~ActiveKeyHandler  \n",GetTStamp(tBuff,56)));
 
         
-        mHandler->Release();
+            mHandler->Release();
+        }
     }
-  }
 
-  HRESULT OnRemoval() { return S_OK; }
+    HRESULT OnRemoval() { return S_OK; }
 
-  CoolKeyHandler *mHandler;
+    CoolKeyHandler *mHandler;
 };
 
 struct ActiveBlinker : public ActiveKeyNode
 {
-  ActiveBlinker(const CoolKey *aKey, BlinkTimerParams *aParams)
-    : ActiveKeyNode(aKey)
-  {
-    assert(aParams);
-    mParams = aParams;
-  }
+    ActiveBlinker(const CoolKey *aKey, BlinkTimerParams *aParams)
+        : ActiveKeyNode(aKey)
+    {
+        assert(aParams);
+        mParams = aParams;
+    }
 
-  ~ActiveBlinker()
-  {
-    if (mParams)
-      delete mParams;
-  }
+    ~ActiveBlinker()
+    {
+        if (mParams)
+            delete mParams;
+    }
+
+    HRESULT OnRemoval()
+    {
+        if (mParams) {
+            mParams->mActive = false;
 
-  HRESULT OnRemoval()
-  {
-    if (mParams) {
-      mParams->mActive = false;
-
-      if (mParams->mThread && mParams->mThread != PR_GetCurrentThread()) {
-        PR_JoinThread(mParams->mThread);
-        mParams->mThread = 0;
-      }
+            if (mParams->mThread && mParams->mThread != PR_GetCurrentThread()) {
+                PR_JoinThread(mParams->mThread);
+                mParams->mThread = 0;
+            }
 
-      delete mParams;
-      mParams = 0;
+            delete mParams;
+            mParams = 0;
+       }
+
+       return S_OK;
     }
 
+    BlinkTimerParams *mParams;
+};
+
+HRESULT CoolKeyNotify(const CoolKey *aKey, CoolKeyState aKeyState,
+                                                int aData,const char *strData)
+{
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG,
+        ("%s CoolKeyNotify: key %s state %d data %d strData %s",GetTStamp(tBuff,56),
+         aKey->mKeyID,aKeyState,aData,strData));
+    if(aKeyState == eCKState_KeyRemoved)
+    {
+        ActiveKeyHandler  *node = (ActiveKeyHandler *) GetNodeInActiveKeyList(aKey);
+        if(node)
+        {
+            if(node->mHandler)
+            {
+                node->mHandler->CancelAuthParameters();
+            }
+        }
+    }
+    std::list<CoolKeyListener*>::iterator it;
+    for(it=g_Listeners.begin(); it!=g_Listeners.end(); ++it)
+    {
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG,
+          ("%s CoolKeyNotify: About to notify listener %p",GetTStamp(tBuff,56),*it));
+        if (g_Dispatch) {
+            (*g_Dispatch)(*it, aKey->mKeyType, aKey->mKeyID,
+                 aKeyState, aData, strData);
+        }
+    }
     return S_OK;
-  }
+}
+
 
-  BlinkTimerParams *mParams;
-};
 
 static std::list<ActiveKeyNode *> g_ActiveKeyList;
 
 static void PR_CALLBACK BlinkTimer(void *arg)
 {
-  BlinkTimerParams *params = (BlinkTimerParams*)arg;
+    BlinkTimerParams *params = (BlinkTimerParams*)arg;
   
-   while(params->mActive && PR_IntervalNow() < params->mEnd) {
-    CKYBuffer ATR;
-    CKYBuffer_InitEmpty(&ATR);
-    CKYCardConnection *conn = NULL;
-    CKYISOStatus apduRC = 0;
-    CKYStatus status;
-    const char *readerName = NULL;
-  
-    CKYCardContext *cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
-    assert(cardCtxt);
-    if (!cardCtxt) {
-      goto done;
-    }
+    while(params->mActive && PR_IntervalNow() < params->mEnd) {
+        CKYBuffer ATR;
+        CKYBuffer_InitEmpty(&ATR);
+        CKYCardConnection *conn = NULL;
+        CKYISOStatus apduRC = 0;
+        CKYStatus status;
+        const char *readerName = NULL;
+  
+        CKYCardContext *cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
+        assert(cardCtxt);
+        if (!cardCtxt) {
+            goto done;
+        }
   
-    conn = CKYCardConnection_Create(cardCtxt);
-    assert(conn);
-    if (!conn) {
-      goto done;
-    }
+        conn = CKYCardConnection_Create(cardCtxt);
+        assert(conn);
+        if (!conn) {
+            goto done;
+        }
 
-    readerName = GetReaderNameForKeyID(&params->mKey);
-    assert(readerName);
-    if (!readerName) {
-      goto done;
-    }
+        readerName = GetReaderNameForKeyID(&params->mKey);
+        assert(readerName);
+        if (!readerName) {
+            goto done;
+        }
 
-    status = CKYCardConnection_Connect(conn, readerName);
-    if (status != CKYSUCCESS) {
-      goto done;
-    }
-    unsigned long state;
+        status = CKYCardConnection_Connect(conn, readerName);
+        if (status != CKYSUCCESS) {
+            goto done;
+        }
+        unsigned long state;
   
-    status = CKYCardConnection_GetStatus(conn, &state, &ATR);
-    if (status != CKYSUCCESS) {
-      goto done;
-    }
+        status = CKYCardConnection_GetStatus(conn, &state, &ATR);
+        if (status != CKYSUCCESS) {
+            goto done;
+        }
 
-    apduRC = 0;
-    status = CKYApplet_SelectCardManager(conn, &apduRC);
-    if (status != CKYSUCCESS) {
-      goto done;
-    }
+        apduRC = 0;
+        status = CKYApplet_SelectCardManager(conn, &apduRC);
+        if (status != CKYSUCCESS) {
+            goto done;
+        }
     
-    done:
+        done:
 
-    if (conn) {
-      CKYCardConnection_Disconnect(conn);
-      CKYCardConnection_Destroy(conn);
-    }
-    if (cardCtxt) {
-      CKYCardContext_Destroy(cardCtxt);
-    }
+        if (conn) {
+             CKYCardConnection_Disconnect(conn);
+             CKYCardConnection_Destroy(conn);
+        }
+        if (cardCtxt) {
+            CKYCardContext_Destroy(cardCtxt);
+        }
 
-    CKYBuffer_FreeData(&ATR);
+        CKYBuffer_FreeData(&ATR);
      
-     PR_Sleep(PR_MillisecondsToInterval(params->mRate));
-   }
+        PR_Sleep(PR_MillisecondsToInterval(params->mRate));
+    }
 
-//  while(params->mActive && PR_IntervalNow() < params->mEnd) {
-    /* call some function that requires communication with the card */
-  //  CK_TOKEN_INFO dummy;
-    //PK11_GetTokenInfo(params->mSlot, &dummy);
-
-/*	CoolKeyInfo *	
-			CKHGetCoolKeyInfo("dummy"); */
-//	tokenName = PK11_GetTokenName(params->mSlot);
-    
-  //  PR_Sleep(PR_MillisecondsToInterval(params->mRate));
- // }
-  
   PK11_FreeSlot(params->mSlot);    
 
   // The assumption we're making here is that if we get here
@@ -390,7 +388,6 @@
 
   if (params->mActive) {
     CoolKeyNotify(&params->mKey, eCKState_BlinkComplete, 0);
-//    ProxyEventToUIThread(new RemoveKeyFromActiveKeyListEvent(&params->mKey));
       RemoveKeyFromActiveKeyList(&params->mKey);
   }
 }
@@ -399,47 +396,48 @@
 CoolKeyBlinkToken(const CoolKey *aKey, unsigned long aRate, unsigned long aDuration)
 {
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyBlinkToken:\n"));
-  BlinkTimerParams* params = new BlinkTimerParams(aKey);
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyBlinkToken:\n",GetTStamp(tBuff,56)));
+    BlinkTimerParams* params = new BlinkTimerParams(aKey);
 
-  if (!params)
-  {
-      PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
-             ("CoolKeyBlinkToken: Can't create BlinkTimerParams.\n"));
-    return E_FAIL;
-  }
+    if (!params)
+    {
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
+             ("%s CoolKeyBlinkToken: Can't create BlinkTimerParams.\n",GetTStamp(tBuff,56)));
+        return E_FAIL;
+    }
   
-  params->mSlot = GetSlotForKeyID(aKey);
+    params->mSlot = GetSlotForKeyID(aKey);
 
-  if (!params->mSlot) {
+    if (!params->mSlot) {
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
-          ("CoolKeyBlinkToken:Can't get Slot for key.\n"));
-    delete params;
-    return E_FAIL;
-  }
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
+          ("%s CoolKeyBlinkToken:Can't get Slot for key.\n",GetTStamp(tBuff,56)));
+        delete params;
+        return E_FAIL;
+    }
   
-  params->mRate = aRate;
-  params->mEnd = PR_IntervalNow() 
+    params->mRate = aRate;
+    params->mEnd = PR_IntervalNow() 
                    + PR_MillisecondsToInterval(aDuration + /*fudge*/ 200);
-  params->mActive = true;
+    params->mActive = true;
   
   
-  ActiveBlinker *node = new ActiveBlinker(aKey, params);
+    ActiveBlinker *node = new ActiveBlinker(aKey, params);
 
-  if (!node) {
-    delete params;
-    return E_FAIL;
-  }
+    if (!node) {
+        delete params;
+        return E_FAIL;
+    }
 
-  HRESULT hres = AddNodeToActiveKeyList(node);
+    HRESULT hres = AddNodeToActiveKeyList(node);
 
-  if (hres == E_FAIL) {
-    delete params;
-    return E_FAIL;
-  }
+    if (hres == E_FAIL) {
+        delete params;
+        return E_FAIL;
+    }
 
-  params->mThread = PR_CreateThread(PR_SYSTEM_THREAD, 
+    params->mThread = PR_CreateThread(PR_SYSTEM_THREAD, 
                                     BlinkTimer, 
                                     (void*)params,
                                     PR_PRIORITY_NORMAL, 
@@ -447,88 +445,86 @@
                                     PR_JOINABLE_THREAD, 
                                     0);
 
-  CoolKeyNotify(aKey, eCKState_BlinkStart, 0);
+    CoolKeyNotify(aKey, eCKState_BlinkStart, 0);
 
-  return S_OK;
+    return S_OK;
 }
 
 HRESULT
 AddNodeToActiveKeyList(ActiveKeyNode *aNode)
 {
+    char tBuff[56];
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("AddNodeToActiveKeyList:\n"));  
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s AddNodeToActiveKeyList:\n",GetTStamp(tBuff,56)));  
 
-  g_ActiveKeyList.push_back(aNode);
-  return S_OK;
+    g_ActiveKeyList.push_back(aNode);
+    return S_OK;
 }
 
 HRESULT
 RemoveKeyFromActiveKeyList(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("RemoveKeyFromActiveKeyList:\n"));
-  std::list<ActiveKeyNode *>::iterator it;
-
-  for (it = g_ActiveKeyList.begin(); it != g_ActiveKeyList.end(); ++it) {
-    if ((*it)->mKey == *aKey) {
-      ActiveKeyNode *node = *it;
-      g_ActiveKeyList.erase(it);
-      node->OnRemoval();
-      delete node;
-      return S_OK;
+    char tBuff[56]; 
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s RemoveKeyFromActiveKeyList:\n",GetTStamp(tBuff,56)));
+    std::list<ActiveKeyNode *>::iterator it;
+
+    for (it = g_ActiveKeyList.begin(); it != g_ActiveKeyList.end(); ++it) {
+        if ((*it)->mKey == *aKey) {
+            ActiveKeyNode *node = *it;
+            g_ActiveKeyList.erase(it);
+            node->OnRemoval();
+            delete node;
+            return S_OK;
+        }
     }
-  }
 
   // XXX: Do we want to return E_FAIL instead?
 
-  return S_OK;
+    return S_OK;
 }
 
 HRESULT
 ClearActiveKeyList()
 {
-  std::list<ActiveKeyNode *>::iterator it;
+    std::list<ActiveKeyNode *>::iterator it;
 
-  for (it = g_ActiveKeyList.begin(); it != g_ActiveKeyList.end(); ++it) {
-    if (*it) {
-      ActiveKeyNode *node = *it;
-      delete node;
+    for (it = g_ActiveKeyList.begin(); it != g_ActiveKeyList.end(); ++it) {
+        if (*it) {
+            ActiveKeyNode *node = *it;
+            delete node;
+        }
     }
-  }
 
-  g_ActiveKeyList.clear();
+    g_ActiveKeyList.clear();
 
-  return S_OK;
+    return S_OK;
 }
 
-
-
 HRESULT
-
 IsNodeInActiveKeyList(const CoolKey *aKey)
 {
+    ActiveKeyNode *test = NULL;
 
-	ActiveKeyNode *test = NULL;
-
-	test = GetNodeInActiveKeyList(aKey);
+    test = GetNodeInActiveKeyList(aKey);
 
-	if(test)
-		return 1;
+    if(test)
+        return 1;
 
-	return 0;
+    return 0;
 
 }
 
 ActiveKeyNode *
 GetNodeInActiveKeyList(const CoolKey *aKey)
 {
-  std::list<ActiveKeyNode *>::iterator it;
+    std::list<ActiveKeyNode *>::iterator it;
 
-  for (it = g_ActiveKeyList.begin(); it != g_ActiveKeyList.end(); ++it) {
-    if ((*it)->mKey == *aKey)
-      return *it;
-  }
+    for (it = g_ActiveKeyList.begin(); it != g_ActiveKeyList.end(); ++it) {
+        if ((*it)->mKey == *aKey)
+            return *it;
+    }
 
-  return NULL;
+    return NULL;
 }
 
 HRESULT CoolKeyEnrollToken(const CoolKey *aKey, const char *aTokenType, 
@@ -536,157 +532,161 @@
                            const char *aScreenNamePWord,const char *aTokenCode)
 {
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
-         ("CoolKeyEnrollToken: aTokenCode %s\n",aTokenCode));
-  if (!aKey || !aKey->mKeyID)
-    return E_FAIL;
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, 
+         ("%s CoolKeyEnrollToken: aTokenCode %s\n",GetTStamp(tBuff,56),aTokenCode));
+    if (!aKey || !aKey->mKeyID)
+        return E_FAIL;
   
-  CoolKeyHandler *handler = new CoolKeyHandler();
+    CoolKeyHandler *handler = new CoolKeyHandler();
   
-  if (!handler)
-    return E_FAIL;
+    if (!handler)
+        return E_FAIL;
   
-  ActiveKeyHandler *node = new ActiveKeyHandler(aKey, handler);
+    ActiveKeyHandler *node = new ActiveKeyHandler(aKey, handler);
 
-  if (!node) {
-    delete handler;
-    return E_FAIL;
-  }
+    if (!node) {
+        delete handler;
+        return E_FAIL;
+    }
 
   // node now has the only reference to the
   // key handler we just created. It will automatically
   // destroy the key handler when it is removed from
   // the active key list.
 
-  HRESULT hres = AddNodeToActiveKeyList(node);
+    HRESULT hres = AddNodeToActiveKeyList(node);
 
-  if (hres == E_FAIL) {
-    delete handler;
-    return hres;
-  }
+    if (hres == E_FAIL) {
+        delete handler;
+        return hres;
+    }
 
-  hres = handler->Init(aKey, aScreenName, aPIN,aScreenNamePWord,aTokenCode,ENROLL);
+    hres = handler->Init(aKey, aScreenName, aPIN,aScreenNamePWord,aTokenCode,ENROLL);
   
-  if (hres == E_FAIL) {
-    RemoveKeyFromActiveKeyList(aKey);
-    return hres;
-  }
+    if (hres == E_FAIL) {
+        RemoveKeyFromActiveKeyList(aKey);
+        return hres;
+    }
   
-  hres = handler->Enroll(aTokenType);
+    hres = handler->Enroll(aTokenType);
   
-  if (hres == E_FAIL) {
-    RemoveKeyFromActiveKeyList(aKey);
-    return hres;
-  }
+    if (hres == E_FAIL) {
+        RemoveKeyFromActiveKeyList(aKey);
+        return hres;
+    }
   
-  CoolKeyNotify(aKey, eCKState_EnrollmentStart, aScreenName ? 1 : 0);
+    CoolKeyNotify(aKey, eCKState_EnrollmentStart, aScreenName ? 1 : 0);
   
-  return S_OK;
+    return S_OK;
 }
 
 HRESULT CoolKeyResetTokenPIN(const CoolKey *aKey, const char *aScreenName, const char *aPIN,const char *aScreenNamePwd)
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyResetTokenPIN:\n"));
-  if (!aKey || !aKey->mKeyID)
-    return E_FAIL;
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyResetTokenPIN:\n",GetTStamp(tBuff,56)));
+    if (!aKey || !aKey->mKeyID)
+        return E_FAIL;
   
-  CoolKeyHandler *handler = new CoolKeyHandler();
+    CoolKeyHandler *handler = new CoolKeyHandler();
   
-  if (!handler)
-    return E_FAIL;
+    if (!handler)
+        return E_FAIL;
   
-  ActiveKeyHandler *node = new ActiveKeyHandler(aKey, handler);
+    ActiveKeyHandler *node = new ActiveKeyHandler(aKey, handler);
 
-  if (!node) {
-    delete handler;
-    return E_FAIL;
-  }
+    if (!node) {
+        delete handler;
+        return E_FAIL;
+    }
 
   // node now has the only reference to the
   // key handler we just created. It will automatically
   // destroy the key handler when it is removed from
   // the active key list.
 
-  HRESULT hres = AddNodeToActiveKeyList(node);
+    HRESULT hres = AddNodeToActiveKeyList(node);
 
-  if (hres == E_FAIL) {
-    delete handler;
-    return E_FAIL;
-  }
+    if (hres == E_FAIL) {
+        delete handler;
+        return E_FAIL;
+    }
   
-  hres = handler->Init(aKey, aScreenName, aPIN,aScreenNamePwd,NULL,RESET_PIN);
+    hres = handler->Init(aKey, aScreenName, aPIN,aScreenNamePwd,NULL,RESET_PIN);
   
-  if (hres == E_FAIL) {
-    RemoveKeyFromActiveKeyList(aKey);
-    return hres;
-  }
+    if (hres == E_FAIL) {
+        RemoveKeyFromActiveKeyList(aKey);
+        return hres;
+    }
   
-  hres = handler->ResetPIN();
+    hres = handler->ResetPIN();
 
-  if (hres == E_FAIL) {
-    RemoveKeyFromActiveKeyList(aKey);
-    return hres;
-  }
+    if (hres == E_FAIL) {
+        RemoveKeyFromActiveKeyList(aKey);
+        return hres;
+    }
   
-  CoolKeyNotify(aKey, eCKState_PINResetStart, aScreenName ? 1 : 0);
+    CoolKeyNotify(aKey, eCKState_PINResetStart, aScreenName ? 1 : 0);
   
-  return S_OK;
+    return S_OK;
 }
 
 HRESULT CoolKeyFormatToken(const CoolKey *aKey, const char *aTokenType, const char *aScreenName, const char *aPIN,const char *aScreenNamePWord,
 									 const char *aTokenCode)
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyFormatToken:\n"));
-  if (!aKey || !aKey->mKeyID)
-    return E_FAIL;
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyFormatToken:\n",GetTStamp(tBuff,56)));
+    if (!aKey || !aKey->mKeyID)
+        return E_FAIL;
   
-  CoolKeyHandler *handler = new CoolKeyHandler();
+    CoolKeyHandler *handler = new CoolKeyHandler();
   
-  if (!handler)
-    return E_FAIL;
+    if (!handler)
+        return E_FAIL;
   
-  ActiveKeyHandler *node = new ActiveKeyHandler(aKey, handler);
+    ActiveKeyHandler *node = new ActiveKeyHandler(aKey, handler);
 
-  if (!node) {
-    delete handler;
-    return E_FAIL;
-  }
+    if (!node) {
+        delete handler;
+        return E_FAIL;
+    }
 
   // node now has the only reference to the
   // key handler we just created. It will automatically
   // destroy the key handler when it is removed from
   // the active key list.
 
-  HRESULT hres = AddNodeToActiveKeyList(node);
+    HRESULT hres = AddNodeToActiveKeyList(node);
 
-  if (hres == E_FAIL) {
-    delete handler;
-    return E_FAIL;
-  }
+    if (hres == E_FAIL) {
+        delete handler;
+        return E_FAIL;
+    }
 
-  hres = handler->Init(aKey, aScreenName, aPIN,aScreenNamePWord,aTokenCode,FORMAT);
+    hres = handler->Init(aKey, aScreenName, aPIN,aScreenNamePWord,aTokenCode,FORMAT);
 
-  if (hres == E_FAIL) {
-    RemoveKeyFromActiveKeyList(aKey);
-    return hres;
-  }
+    if (hres == E_FAIL) {
+        RemoveKeyFromActiveKeyList(aKey);
+        return hres;
+    }
   
-  hres = handler->Format(aTokenType);
+    hres = handler->Format(aTokenType);
   
-  if (hres == E_FAIL) {
-    RemoveKeyFromActiveKeyList(aKey);
-    return hres;
-  }
+    if (hres == E_FAIL) {
+        RemoveKeyFromActiveKeyList(aKey);
+        return hres;
+    }
   
-  CoolKeyNotify(aKey, eCKState_FormatStart, 0);
+    CoolKeyNotify(aKey, eCKState_FormatStart, 0);
   
-  return S_OK;
+    return S_OK;
 }
 
 COOLKEY_API HRESULT CoolKeySetDataValue(const CoolKey *aKey,const char *name, const char *value)
 {
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeySetDataValue: name %s value %s\n",name,value));  
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeySetDataValue: name %s value %s\n",GetTStamp(tBuff,56),name,value));  
 
     if (!aKey || !aKey->mKeyID)
         return E_FAIL; 
@@ -705,140 +705,135 @@
 
 HRESULT CoolKeyCancelTokenOperation(const CoolKey *aKey)
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyCancelTokenOperation:\n",GetTStamp(tBuff,56))); 
+    if (!aKey || !aKey->mKeyID)
+        return E_FAIL;
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyCancelTokenOperation:\n")); 
-  if (!aKey || !aKey->mKeyID)
-    return E_FAIL;
-
-
-  ActiveKeyHandler *node = (ActiveKeyHandler *) GetNodeInActiveKeyList(aKey);
+    ActiveKeyHandler *node = (ActiveKeyHandler *) GetNodeInActiveKeyList(aKey);
 
-  
-  if (node) {
+    if (node) {
 
         if(node->mHandler)
         {
-	   node->mHandler->setCancelled();
-	   node->mHandler->CloseConnection();
+            node->mHandler->setCancelled();
+            node->mHandler->CloseConnection();
 
         }
     RemoveKeyFromActiveKeyList(aKey);
     RefreshInfoFlagsForKeyID(aKey);
-	CoolKeyNotify(aKey, eCKState_OperationCancelled, 0);
+    CoolKeyNotify(aKey, eCKState_OperationCancelled, 0);
     
-  }
+    }
 
-  return S_OK;
- } 
+    return S_OK;
+} 
 
 bool
 CoolKeyHasApplet(const CoolKey  *aKey)
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyHasApplet:\n",GetTStamp(tBuff,56)));
+    bool hasApplet = false;
+  
+    if (aKey && aKey->mKeyID) {
+        CoolKeyInfo *info = GetCoolKeyInfoByKeyID(aKey);
+        if (info)
+        {
+            hasApplet = (HAS_APPLET(info->mInfoFlags) != 0);
 
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyHasApplet:\n"));
-  bool hasApplet = false;
-  
-  if (aKey && aKey->mKeyID) {
-    CoolKeyInfo *info = GetCoolKeyInfoByKeyID(aKey);
-    if (info)
-    {
-      hasApplet = (HAS_APPLET(info->mInfoFlags) != 0);
-
-      PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyHasApplet: hasApplet: %d info flags %x\n",hasApplet,info->mInfoFlags));
+            PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyHasApplet: hasApplet: %d info flags %x\n",GetTStamp(tBuff,56),hasApplet,info->mInfoFlags));
 
+        }
     }
-  }
   
-  return hasApplet;
+    return hasApplet;
 }
 
 bool
 CoolKeyIsEnrolled(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyIsEnrolled:\n"));
-  bool isEnrolled = false;
-  
-  if (aKey && aKey->mKeyID) {
-    CoolKeyInfo *info = GetCoolKeyInfoByKeyID(aKey);
-    if (info)
-    {
-      isEnrolled = (IS_PERSONALIZED(info->mInfoFlags) != 0);
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyIsEnrolled:\n",GetTStamp(tBuff,56)));
+    bool isEnrolled = false;
+  
+    if (aKey && aKey->mKeyID) {
+        CoolKeyInfo *info = GetCoolKeyInfoByKeyID(aKey);
+        if (info)
+        {
+            isEnrolled = (IS_PERSONALIZED(info->mInfoFlags) != 0);
 
-      PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyIsEnrolled: enrolled: %d info flags %x\n",isEnrolled,info->mInfoFlags));
+            PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyIsEnrolled: enrolled: %d info flags %x\n",GetTStamp(tBuff,56),isEnrolled,info->mInfoFlags));
+        }
     }
-  }
   
-  return isEnrolled;
+    return isEnrolled;
 }
 
 bool
 CoolKeyAuthenticate(const CoolKey *aKey, const char *aPIN)
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyAuthenticate:\n"));
-  if (!aKey || !aKey->mKeyID)
-    return false;
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyAuthenticate:\n",GetTStamp(tBuff,56)));
+    if (!aKey || !aKey->mKeyID)
+        return false;
   
-  return NSSManager::AuthenticateCoolKey(aKey, aPIN);
+    return NSSManager::AuthenticateCoolKey(aKey, aPIN);
 }
 
 HRESULT
 CoolKeyGenerateRandomData(unsigned char *aBuf, int aBufLen)
 {
-  if (!aBuf || aBufLen < 1)
-    return E_FAIL;
+    if (!aBuf || aBufLen < 1)
+         return E_FAIL;
   
-  SECStatus status = PK11_GenerateRandom(aBuf, aBufLen);
-  return status;
+    SECStatus status = PK11_GenerateRandom(aBuf, aBufLen);
+    return status;
 }
 
 HRESULT CoolKeyGetSignatureLength(const CoolKey *aKey, int *aLength)
 {
-  return NSSManager::GetSignatureLength(aKey, aLength);
+    return NSSManager::GetSignatureLength(aKey, aLength);
 }
 
 HRESULT
 CoolKeySignData(const CoolKey *aKey, const unsigned char *aData, int aDataLen, unsigned char *aSignedData, int *aSignedDataLen)
 {
-  if (!aKey || !aKey->mKeyID || !aData || aDataLen < 1 ||
-      !aSignedData || !aSignedDataLen)
-    return E_FAIL;
+    if (!aKey || !aKey->mKeyID || !aData || aDataLen < 1 ||
+        !aSignedData || !aSignedDataLen)
+        return E_FAIL;
   
-  return NSSManager::SignDataWithKey(aKey, aData, aDataLen, aSignedData, aSignedDataLen);
+    return NSSManager::SignDataWithKey(aKey, aData, aDataLen, aSignedData, aSignedDataLen);
 }
 HRESULT
 CoolKeyGetCertNicknames( const CoolKey *aKey , std::vector<std::string> & aNames)
 {
-
     if(!aKey )
         return E_FAIL;
 
-   HRESULT res = NSSManager::GetKeyCertNicknames(aKey,aNames); 
-
-   return res;
+    HRESULT res = NSSManager::GetKeyCertNicknames(aKey,aNames); 
 
+    return res;
 }
 
 HRESULT 
 CoolKeyGetCertInfo(const CoolKey *aKey, char *aCertNickname, std::string & aCertInfo)
 {
-
     if(!aKey || !aCertNickname)
     {
         return E_FAIL;
-
     }
 
     return NSSManager::GetKeyCertInfo(aKey,aCertNickname,aCertInfo);
-
 }
 
 HRESULT
 CoolKeyGetPolicy(const CoolKey *aKey, char *aBuf, int aBufLen)
 {
-  if (!aKey || !aKey->mKeyID || !aBuf || aBufLen < 1)
-    return E_FAIL;
+    if (!aKey || !aKey->mKeyID || !aBuf || aBufLen < 1)
+        return E_FAIL;
   
-  return NSSManager::GetKeyPolicy(aKey, aBuf, aBufLen);
+    return NSSManager::GetKeyPolicy(aKey, aBuf, aBufLen);
 }
 HRESULT
 CoolKeyGetIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength)
@@ -847,16 +842,15 @@
         return E_FAIL;
 
     return NSSManager::GetKeyIssuedTo(aKey,aBuf,aBufLength);
-
 }
 
 HRESULT CoolKeyGetATR(const CoolKey *aKey, char *aBuf, int aBufLen)
 {
-
+    char tBuff[56];
     if (!aKey || !aKey->mKeyID || !aBuf || aBufLen < 1)
          return E_FAIL;
     aBuf[0] = 0;
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetATR::\n"));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyGetATR::\n",GetTStamp(tBuff,56)));
 
     HRESULT result = S_OK;
 
@@ -867,23 +861,22 @@
 
     if((int) strlen(atr) < aBufLen)
     {
-
         sprintf(aBuf,"%s",(char *) atr);
     }
 
     return result;
-
 }
 
 HRESULT CoolKeyGetIssuerInfo(const CoolKey *aKey, char *aBuf, int aBufLen)
 {
-
-     if (!aKey || !aKey->mKeyID || !aBuf || aBufLen < 1)
+    char tBuff[56];
+ 
+    if (!aKey || !aKey->mKeyID || !aBuf || aBufLen < 1)
          return E_FAIL;
 
      aBuf[0] = 0;
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo::\n"));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyGetIssuerInfo::\n",GetTStamp(tBuff,56)));
 
     CKYBuffer ISSUER_INFO;
     CKYBuffer_InitEmpty(&ISSUER_INFO);
@@ -896,38 +889,37 @@
 
     HRESULT result = S_OK;
 
-
     CKYCardContext *cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER);
 
-     assert(cardCtxt);
+    assert(cardCtxt);
     if (!cardCtxt) {
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Context !.\n"));
-      result = E_FAIL;
-      goto done;
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Attempting to get key issuer info. Can't create Card Context !.\n",GetTStamp(tBuff,56)));
+        result = E_FAIL;
+        goto done;
     }
 
     conn = CKYCardConnection_Create(cardCtxt);
     assert(conn);
     if (!conn) {
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't create Card Connection!\n"));
-      result = E_FAIL;
-      goto done;
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Attempting to get key issuer info.  Can't create Card Connection!\n",GetTStamp(tBuff,56)));
+        result = E_FAIL;
+        goto done;
     }
 
     readerName = GetReaderNameForKeyID(aKey);
     assert(readerName);
     if (!readerName) {
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't get reader name!\n"));
-      result = E_FAIL;
-      goto done;
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Attempting to get key issuer info.  Can't get reader name!\n",GetTStamp(tBuff,56)));
+        result = E_FAIL;
+        goto done;
     }
 
     status = CKYCardConnection_Connect(conn, readerName);
     if (status != CKYSUCCESS) {
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't connect to Card!\n"));
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Attempting to get key issuer info. Can't connect to Card!\n",GetTStamp(tBuff,56)));
 
-      result = E_FAIL;
-      goto done;
+        result = E_FAIL;
+        goto done;
     }
 
 #ifndef DARWIN
@@ -936,17 +928,15 @@
     apduRC = 0;
     status = CKYApplet_SelectCoolKeyManager(conn, &apduRC);
     if (status != CKYSUCCESS) {
-
-      PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Can't select CoolKey manager!\n"));
-      goto done;
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Attempting to get key issuer info.  Can't select CoolKey manager!\n",GetTStamp(tBuff,56)));
+        goto done;
     }
 
     status = CKYApplet_GetIssuerInfo(conn, &ISSUER_INFO,
                         &apduRC);
-
     if(status != CKYSUCCESS)
     {
-        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info.  Error actually getting IssuerInfo!\n"));
+        PR_LOG( coolKeyLog, PR_LOG_ERROR, ("%s Attempting to get key issuer info.  Error actually getting IssuerInfo!\n",GetTStamp(tBuff,56)));
         result = E_FAIL;
         goto done;
     }
@@ -955,14 +945,14 @@
 
     if(infoSize == 0)
     {
-        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: IssuerInfo buffer size is zero!\n"));
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyGetIssuerInfo:: IssuerInfo buffer size is zero!\n",GetTStamp(tBuff,56)));
         result = E_FAIL;
         goto done;
     }
 
     if(infoSize >= (CKYSize ) aBufLen)
     {
-        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Insufficient space to put Issuer Info!\n"));
+        PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyGetIssuerInfo:: Insufficient space to put Issuer Info!\n",GetTStamp(tBuff,56)));
 
         result = E_FAIL;
         goto done;
@@ -970,7 +960,7 @@
 
     infoData = CKYBuffer_Data(&ISSUER_INFO);
 
-    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: IssuerInfo actual data %s!\n",(char *) infoData));
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyGetIssuerInfo:: IssuerInfo actual data %s!\n",GetTStamp(tBuff,56),(char *) infoData));
     if(infoData)
     {
         strcpy((char *) aBuf, (char *) infoData);
@@ -980,13 +970,13 @@
 
     if (conn) {
 #ifndef DARWIN
-      CKYCardConnection_EndTransaction(conn);
+        CKYCardConnection_EndTransaction(conn);
 #endif
-      CKYCardConnection_Disconnect(conn);
-      CKYCardConnection_Destroy(conn);
+        CKYCardConnection_Disconnect(conn);
+        CKYCardConnection_Destroy(conn);
     }
     if (cardCtxt) {
-      CKYCardContext_Destroy(cardCtxt);
+        CKYCardContext_Destroy(cardCtxt);
     }
 
     CKYBuffer_FreeData(&ISSUER_INFO);
@@ -996,96 +986,87 @@
 
 bool    CoolKeyIsReallyCoolKey(const CoolKey *aKey)
 {
-   bool res = false;
+    bool res = false;
 
-   if(!aKey)
-       return res;
+    if(!aKey)
+        return res;
 
+    CoolKeyInfo *info =
+        GetCoolKeyInfoByKeyID(aKey);
 
-   CoolKeyInfo *info =
-      GetCoolKeyInfoByKeyID(aKey);
+    if(!info)
+        return res;
 
-   if(!info)
-      return res;
+    if( IS_REALLY_A_COOLKEY(info->mInfoFlags))
+        res = true;
 
-   if( IS_REALLY_A_COOLKEY(info->mInfoFlags))
-      res = true;
-
-   return res;
+    return res;
 }
 
 int CoolKeyGetAppletVer(const CoolKey *aKey, const bool isMajor)
 {
+    int result = -1;
+    if(!aKey)
+        return result;
 
-  int result = -1;
-  if(!aKey)
-      return result;
-
-  CoolKeyInfo *info =
-      GetCoolKeyInfoByKeyID(aKey);
-
-  if(!info)
-      return result;
+    CoolKeyInfo *info =
+        GetCoolKeyInfoByKeyID(aKey);
 
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    if(!info)
+        return result;
 
-  if(!slot)
-      return result;
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
 
-  CK_TOKEN_INFO tokenInfo;
-  PK11_GetTokenInfo(slot, &tokenInfo);
+    if(!slot)
+        return result;
 
-  if(isMajor)
-     result = (int) tokenInfo.firmwareVersion.major;
-  else
-     result = (int) tokenInfo.firmwareVersion.minor;
+    CK_TOKEN_INFO tokenInfo;
+    PK11_GetTokenInfo(slot, &tokenInfo);
 
-   return result;
+    if(isMajor)
+        result = (int) tokenInfo.firmwareVersion.major;
+    else
+        result = (int) tokenInfo.firmwareVersion.minor;
 
+    return result;
 }
 
-
 bool
 CoolKeyHasReader(const CoolKey *aKey)
 {
+    bool res = false;
 
-   bool res = false;
-
+    if(!aKey)
+         return res;
 
-   if(!aKey)
-       return res;
-
-
-   const char *readerName =  GetReaderNameForKeyID(aKey);
-
-
-   if(readerName)
-       res = true;
-
-   return res;
+    const char *readerName =  GetReaderNameForKeyID(aKey);
 
+    if(readerName)
+         res = true;
 
+    return res;
 }
 
 
 bool
 CoolKeyRequiresAuthentication(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyRequiresAuthentication:\n"));
-  if (!aKey || !aKey->mKeyID)
-    return false;
-  
-  return NSSManager::RequiresAuthentication(aKey);
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyRequiresAuthentication:\n",GetTStamp(tBuff,56)));
+    if (!aKey || !aKey->mKeyID)
+        return false;
+    return NSSManager::RequiresAuthentication(aKey);
 }
 
 bool
 CoolKeyIsAuthenticated(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyIsAuthenticated:\n"));
-  if (!aKey || !aKey->mKeyID)
-    return false;
+    char tBuff[56];
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeyIsAuthenticated:\n",GetTStamp(tBuff,56)));
+    if (!aKey || !aKey->mKeyID)
+        return false;
   
-  return NSSManager::IsAuthenticated(aKey);
+    return NSSManager::IsAuthenticated(aKey);
 }
 
 #define NIBBLE_TO_HEX(nibble, caps) ((nibble) < 10) ? ((nibble) + '0') : ((nibble) - 10 + ((caps) ? 'A' : 'a'));
@@ -1099,42 +1080,42 @@
 {
   // Check if there's enough room to accomodate our output.
   
-  if (aOutputLength < ((aInputLength*2) + 1))
-    return E_FAIL;
+    if (aOutputLength < ((aInputLength*2) + 1))
+        return E_FAIL;
   
-  unsigned long outIdx = 0;
-  unsigned long i;
+    unsigned long outIdx = 0;
+    unsigned long i;
   
-  for (i = 0; i < aInputLength; i++) {
-    unsigned char hbits = aInput[i] >> 4;
-    unsigned char lbits = aInput[i] & 0x0F;
+    for (i = 0; i < aInputLength; i++) {
+        unsigned char hbits = aInput[i] >> 4;
+        unsigned char lbits = aInput[i] & 0x0F;
     
-    aOutput[outIdx++] = NIBBLE_TO_HEX(hbits, aCaps);
-    aOutput[outIdx++] = NIBBLE_TO_HEX(lbits, aCaps);
-  }
+        aOutput[outIdx++] = NIBBLE_TO_HEX(hbits, aCaps);
+        aOutput[outIdx++] = NIBBLE_TO_HEX(lbits, aCaps);
+    }
   
-  aOutput[outIdx] = '\0';
+    aOutput[outIdx] = '\0';
   
-  return S_OK;
+    return S_OK;
 }
 
 const char *
 CoolKeyGetTokenName(const CoolKey *aKey)
 {
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
-  const char *tokenName = PK11_GetTokenName(slot);
-  PK11_FreeSlot(slot);  // depending 
-  return tokenName;
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    const char *tokenName = PK11_GetTokenName(slot);
+    PK11_FreeSlot(slot);  // depending 
+    return tokenName;
 }
 
 const char *
 CoolKeyGetKeyID(const char *tokenName, int *aKeyType)
 {
-  CoolKeyInfo *keyInfo = GetCoolKeyInfoByTokenName(tokenName);
-  const char *aCUID = keyInfo->mCUID;
+    CoolKeyInfo *keyInfo = GetCoolKeyInfoByTokenName(tokenName);
+    const char *aCUID = keyInfo->mCUID;
 
-  *aKeyType = eCKType_CoolKey;
-  return aCUID;
+    *aKeyType = eCKType_CoolKey;
+    return aCUID;
 }
 
 const char *CoolKeyGetConfig(const char *aValue)
@@ -1161,3 +1142,20 @@
 
    return res;
 }
+
+//Utility function to get Time Stamp
+char *GetTStamp(char *aTime,int aSize)
+{
+    if(!aTime)
+        return NULL;
+    int maxSize = 55;
+    if(aSize < maxSize)
+        return NULL;
+
+    char *tFormat = "[%c]";
+    time_t tm = time(NULL);
+    struct tm *ptr = localtime(&tm);
+    strftime(aTime ,maxSize ,tFormat,ptr);
+    return aTime;
+}
+



From fedora-directory-commits at redhat.com  Sat Feb 24 02:15:02 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:15:02 -0500
Subject: [Fedora-directory-commits] esc/src/lib/coolkey CoolKey.h,1.3,1.4
Message-ID: <200702240215.l1O2F2tY002050@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2025

Modified Files:
	CoolKey.h 
Log Message:
Add prototype for time stamp utility function.



Index: CoolKey.h
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoolKey.h	9 Feb 2007 22:00:37 -0000	1.3
+++ CoolKey.h	24 Feb 2007 02:15:00 -0000	1.4
@@ -175,6 +175,8 @@
 
 COOLKEY_API int CoolKeyGetAppletVer(const CoolKey *aKey, const bool isMajor);
 
+//Utility time function
+char *GetTStamp(char *aTime,int aSize);
 }
 
 ////////////////////////////////////////////////////////////////////////



From fedora-directory-commits at redhat.com  Sat Feb 24 02:16:43 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:16:43 -0500
Subject: [Fedora-directory-commits] esc/src/lib/coolkey CoolKeyHandler.cpp,
	1.2, 1.3
Message-ID: <200702240216.l1O2Gh4g002153@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2137

Modified Files:
	CoolKeyHandler.cpp 
Log Message:
Add time stamp to log messages and handle cancelled operation better.



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 CoolKeyHandler.cpp
Index: CoolKeyHandler.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKeyHandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoolKeyHandler.cpp	27 Sep 2006 17:47:46 -0000	1.2
+++ CoolKeyHandler.cpp	24 Feb 2007 02:16:41 -0000	1.3
@@ -21,6 +21,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string>
+#include <time.h>
 
 #include "prprf.h"
 #include "nss.h"
@@ -46,7 +47,6 @@
 
 //static  char *test_extended_login = "s=325&msg_type=13&invalid_login=0&blocked=0&error=&required_parameter0=id%3DUSER%5FID%26name%3DUser+ID%26desc%3DUser+ID%26type%3Dstring%26option%3Doption1%2Coption2%2Coption3&required_parameter1=id%3DUSER%5FPWD%26name%3DUser+Password%26desc%3DUser+Password%26type%3Dpassword%26option%3D&required_parameter2=id%3DUSER%5FPIN%26name%3DPIN%26desc%3DOne+time+PIN+received+via+mail%26type%3Dpassword%26option%3D";
 
-
 #include <string>
 
 #ifndef CKO_MOZILLA_READER
@@ -59,52 +59,52 @@
 
 void NotifyEndResult(CoolKeyHandler* context, int operation, int result, int description);
 
-
 struct AutoCKYBuffer : public CKYBuffer
 {
-  AutoCKYBuffer() { CKYBuffer_InitEmpty(this); };
-  AutoCKYBuffer(const char *aHex) { CKYBuffer_InitFromHex(this, aHex); };
-  AutoCKYBuffer(unsigned const char *aData, unsigned int aLength) { CKYBuffer_InitFromData(this, aData, aLength); };
-  AutoCKYBuffer(unsigned long aLength) { CKYBuffer_InitFromLen(this, aLength); };
-  ~AutoCKYBuffer() { CKYBuffer_FreeData(this); };
+    AutoCKYBuffer() { CKYBuffer_InitEmpty(this); };
+    AutoCKYBuffer(const char *aHex) { CKYBuffer_InitFromHex(this, aHex); };
+    AutoCKYBuffer(unsigned const char *aData, unsigned int aLength) { CKYBuffer_InitFromData(this, aData, aLength); };
+    AutoCKYBuffer(unsigned long aLength) { CKYBuffer_InitFromLen(this, aLength); };
+    ~AutoCKYBuffer() { CKYBuffer_FreeData(this); };
 };
 
 struct KHHttpEvent
 {
-  KHHttpEvent(CoolKeyHandler *aKeyHandler,NSS_HTTP_HANDLE handle)
-    : mKeyHandler(aKeyHandler), mHttpHandle(handle)
-  {
-  }
+    KHHttpEvent(CoolKeyHandler *aKeyHandler,NSS_HTTP_HANDLE handle)
+        : mKeyHandler(aKeyHandler), mHttpHandle(handle)
+    {
+    }
 
-  virtual ~KHHttpEvent()
-  {
-  }
+    virtual ~KHHttpEvent()
+    {
+    }
 
-  virtual HRESULT Execute() = 0;
+    virtual HRESULT Execute() = 0;
 
-  CoolKeyHandler *mKeyHandler;
-  NSS_HTTP_HANDLE mHttpHandle;
+    CoolKeyHandler *mKeyHandler;
+    NSS_HTTP_HANDLE mHttpHandle;
   
 };
 
 struct KHOnConnectEvent : public KHHttpEvent
 {
-  KHOnConnectEvent(CoolKeyHandler *aKeyHandler, NSS_HTTP_HANDLE handle)
-    : KHHttpEvent(aKeyHandler, handle)
-  {
-  }
+    KHOnConnectEvent(CoolKeyHandler *aKeyHandler, NSS_HTTP_HANDLE handle)
+        : KHHttpEvent(aKeyHandler, handle)
+    {
+    }
 
-  HRESULT Execute()
-  {
-       PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("KHOnConnectEvent::Execute:\n"));
-	  HRESULT res;
-    res =  mKeyHandler->OnConnectImpl();
+    HRESULT Execute()
+    {
+        char tBuff[56];
+        PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s KHOnConnectEvent::Execute:\n",GetTStamp(tBuff,56)));
+        HRESULT res;
+        res =  mKeyHandler->OnConnectImpl();
 	if(res == E_FAIL)
 	{
-		mKeyHandler->OnDisConnectImpl();
+            mKeyHandler->OnDisConnectImpl();
 	}
 
-	return res;
+        return res;
   }
 };
 
@@ -112,128 +112,126 @@
 {
 public:
 
-  PDUWriterThread(CoolKeyHandler *aHandler) {mAccepting=PR_FALSE; mHandler = aHandler;};
- ~PDUWriterThread() ;
+    PDUWriterThread(CoolKeyHandler *aHandler) {mAccepting=PR_FALSE; mHandler = aHandler;};
+    ~PDUWriterThread() ;
 
-  HRESULT Init();
+    HRESULT Init();
 
-  HRESULT QueueKHHttpEvent(KHHttpEvent *aEvent);
-  HRESULT QueueOnConnectEvent(CoolKeyHandler *aKeyHandler,
+    HRESULT QueueKHHttpEvent(KHHttpEvent *aEvent);
+    HRESULT QueueOnConnectEvent(CoolKeyHandler *aKeyHandler,
                               NSS_HTTP_HANDLE handle);
  
-  HRESULT Shutdown();
+    HRESULT Shutdown();
 
-  static void ThreadRun(void* arg);
+    static void ThreadRun(void* arg);
 
-  PRLock    *mLock;
-  PRCondVar *mCondVar;
-  PRThread  *mThread;
-  PRBool     mAccepting;
+    PRLock    *mLock;
+    PRCondVar *mCondVar;
+    PRThread  *mThread;
+    PRBool     mAccepting;
 
-  CoolKeyHandler *mHandler;
+    CoolKeyHandler *mHandler;
 
-  std::list<KHHttpEvent*> mPendingEvents;
+    std::list<KHHttpEvent*> mPendingEvents;
 };
 
 PDUWriterThread::~PDUWriterThread() 
 {
-
-    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("PDUWriterThread::~PDUWriterThread:\n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s PDUWriterThread::~PDUWriterThread:\n",GetTStamp(tBuff,56)));
 
     if (mCondVar ) {
 
-    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CoolKeyHandler::PDUWriterThread::~PDUWriterThreade about to destroy mCondVar.\n"));
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CoolKeyHandler::PDUWriterThread::~PDUWriterThreade about to destroy mCondVar.\n",GetTStamp(tBuff,56)));
 
     PR_DestroyCondVar(mCondVar);
     mCondVar = NULL;
-  }
-
-  if (mLock ) {
-    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CoolKeyHandler::PDUWriterThread::~PDUWriterThread  about to destroy mLock.\n"));
-
-    PR_DestroyLock(mLock);
-    mLock = NULL;
-  }
+    }
 
-  PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CoolKeyHandler::PDUWriterThread::~PDUWriterThread leaving....\n"));
+    if (mLock ) {
+        PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CoolKeyHandler::PDUWriterThread::~PDUWriterThread  about to destroy mLock.\n",GetTStamp(tBuff,56)));
 
+        PR_DestroyLock(mLock);
+        mLock = NULL;
+    }
 
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CoolKeyHandler::PDUWriterThread::~PDUWriterThread leaving....\n",GetTStamp(tBuff,56)));
 }
 
 void
 PDUWriterThread::ThreadRun(void *arg)
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s PDUWriterThread::ThreadRun:\n",GetTStamp(tBuff,56)));
+    PDUWriterThread *pn = (PDUWriterThread*) arg;
 
-  PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("PDUWriterThread::ThreadRun:\n"));
-  PDUWriterThread *pn = (PDUWriterThread*) arg;
-
-  while (pn->mAccepting && pn->mLock && pn->mCondVar) {
+    while (pn->mAccepting && pn->mLock && pn->mCondVar) {
 
-    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("PDUWriterThread::ThreadRun: top of while loop accepting %d lock %p cond %p\n",pn->mAccepting,pn->mLock,pn->mCondVar));
-    PR_Lock(pn->mLock);
+        PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s PDUWriterThread::ThreadRun: top of while loop accepting %d lock %p cond %p\n",GetTStamp(tBuff,56),pn->mAccepting,pn->mLock,pn->mCondVar));
+        PR_Lock(pn->mLock);
 
-    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("PDUWriterThread::ThreadRun: done PR_Lock()\\n"));
+        PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s PDUWriterThread::ThreadRun: done PR_Lock()\\n",GetTStamp(tBuff,56)));
 
[...2857 lines suppressed...]
+        goto failed;
+    }
 
   // get the reader name (though we probably don't need it anymore 
-  status = PK11_ReadRawAttribute(PK11_TypeGeneric, obj, CKA_LABEL, &label); 
-  if (status != SECSuccess) {
-    goto  failed;
-  }
+    status = PK11_ReadRawAttribute(PK11_TypeGeneric, obj, CKA_LABEL, &label); 
+    if (status != SECSuccess) {
+        goto  failed;
+    }
 
   // get the ATR (though, again, we probably don't need it 
-  status = PK11_ReadRawAttribute(PK11_TypeGeneric, obj, CKA_MOZILLA_ATR, &ATR); 
+    status = PK11_ReadRawAttribute(PK11_TypeGeneric, obj, CKA_MOZILLA_ATR, &ATR); 
  // PK11_DestroyGenericObjects(obj);
-  if (status != SECSuccess) {
-    goto failed;
-  }
+    if (status != SECSuccess) {
+        goto failed;
+    }
   // get the CUID/Serial number (we *WILL* continue to need it )
-  status = PK11_GetTokenInfo(aSlot,&tokenInfo);
-  if (status != SECSuccess) {
-    goto failed;
-  }
+    status = PK11_GetTokenInfo(aSlot,&tokenInfo);
+    if (status != SECSuccess) {
+        goto failed;
+    }
 
   //get the are we a CoolKey value
 
-  status = PK11_ReadRawAttribute(PK11_TypeGeneric, obj, CKA_MOZILLA_IS_COOL_KEY, &isCOOLKey);
+    status = PK11_ReadRawAttribute(PK11_TypeGeneric, obj, CKA_MOZILLA_IS_COOL_KEY, &isCOOLKey);
 
-  PK11_DestroyGenericObjects(obj);
-  obj = NULL;
+    PK11_DestroyGenericObjects(obj);
+    obj = NULL;
 
-  if (status != SECSuccess) {
-    goto  failed;
-  }
+    if (status != SECSuccess) {
+        goto  failed;
+    }
 
-  if(isCOOLKey.len == 1)
-  {
-       PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CKHGetCoolKeyInfo: CKA_MOZILLA_IS_COOL_KEY  %d.\n",(int) isCOOLKey.data[0]));
+    if(isCOOLKey.len == 1)
+    {
+         PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CKHGetCoolKeyInfo: CKA_MOZILLA_IS_COOL_KEY  %d.\n",GetTStamp(tBuff,56),(int) isCOOLKey.data[0]));
 
-       isACOOLKey=(int) isCOOLKey.data[0]; 
-  } 
+         isACOOLKey=(int) isCOOLKey.data[0]; 
+    } 
 
-  PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CKHGetCoolKeyInfo: info->flags %u.\n",tokenInfo.flags));
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CKHGetCoolKeyInfo: info->flags %u.\n",GetTStamp(tBuff,56),tokenInfo.flags));
   
-  PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CKHGetCoolKeyInfo: info->label %s.\n",(char *)tokenInfo.label));
-  PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CKHGetCoolKeyInfo: info->manufacturerID %s.\n",(char *)tokenInfo.manufacturerID));
-  PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CKHGetCoolKeyInfo: info->model %s.\n",(char *)tokenInfo.model));
-  PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CKHGetCoolKeyInfo: info->serialNumber %s.\n",(char *)tokenInfo.serialNumber));
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CKHGetCoolKeyInfo: info->label %s.\n",GetTStamp(tBuff,56),(char *)tokenInfo.label));
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CKHGetCoolKeyInfo: info->manufacturerID %s.\n",GetTStamp(tBuff,56),(char *)tokenInfo.manufacturerID));
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CKHGetCoolKeyInfo: info->model %s.\n",GetTStamp(tBuff,56),(char *)tokenInfo.model));
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CKHGetCoolKeyInfo: info->serialNumber %s.\n",GetTStamp(tBuff,56),(char *)tokenInfo.serialNumber));
 
-  PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CKHGetCoolKeyInfo: info->firmwareVersion.major %d info->firmwareVersion.minor %d \n",(int)tokenInfo.firmwareVersion.major,(int) tokenInfo.firmwareVersion.minor));
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CKHGetCoolKeyInfo: info->firmwareVersion.major %d info->firmwareVersion.minor %d \n",GetTStamp(tBuff,56),(int)tokenInfo.firmwareVersion.major,(int) tokenInfo.firmwareVersion.minor));
 
 
   // OK, we have everything we need, now build the COOLKEYInfo structure.
-  info = new CoolKeyInfo();
-  if (!info) {
-    goto failed;
-  }
+    info = new CoolKeyInfo();
+    if (!info) {
+        goto failed;
+    }
 
-  atrSize = ATR.len*2+5;
-  atrString = (char *)malloc(atrSize);
-  hres = CoolKeyBinToHex(ATR.data, ATR.len, 
+    atrSize = ATR.len*2+5;
+    atrString = (char *)malloc(atrSize);
+    hres = CoolKeyBinToHex(ATR.data, ATR.len, 
 				(unsigned char *) atrString, atrSize, true);
   /* shouldn't the be != S_SUCCESS? */
-  if (hres == E_FAIL) {
-    free(atrString);
-    goto failed;
-  }
-  SECITEM_FreeItem(&ATR,PR_FALSE);
-  ATR.data = NULL;
+    if (hres == E_FAIL) {
+        free(atrString);
+        goto failed;
+    }
+    SECITEM_FreeItem(&ATR,PR_FALSE);
+    ATR.data = NULL;
 
 
-  PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("CKHGetCoolKeyInfo: info->atr %s.\n",(char *)atrString));
+    PR_LOG( coolKeyLogHN, PR_LOG_DEBUG, ("%s CKHGetCoolKeyInfo: info->atr %s.\n",GetTStamp(tBuff,56),(char *)atrString));
 
 
-  info->mATR = atrString;
-  info->mReaderName= (char *)malloc(label.len+1);
-  if (!info->mReaderName) {
-    goto failed;
-  }
-  memcpy(info->mReaderName, label.data, label.len);
-  info->mReaderName[label.len] = 0;
-  info->mInfoFlags = MapGetFlags(&tokenInfo);
+    info->mATR = atrString;
+    info->mReaderName= (char *)malloc(label.len+1);
+    if (!info->mReaderName) {
+        goto failed;
+    }
+    memcpy(info->mReaderName, label.data, label.len);
+    info->mReaderName[label.len] = 0;
+    info->mInfoFlags = MapGetFlags(&tokenInfo);
 
   //Handle the isCOOLKey flag
-  if(isACOOLKey) {
-    info->mInfoFlags |= COOLKEY_INFO_IS_REALLY_A_COOLKEY_MASK;
-  }
+    if(isACOOLKey) {
+        info->mInfoFlags |= COOLKEY_INFO_IS_REALLY_A_COOLKEY_MASK;
+    }
 
-  info->mCUID = (char *)malloc(35); /* should be a define ! */
-  if (!info->mCUID) {
-    goto failed;
-  }
-  hres = getCUIDFromTokenInfo(&tokenInfo, info->mCUID);
+    info->mCUID = (char *)malloc(35); /* should be a define ! */
+    if (!info->mCUID) {
+      goto failed;
+    }
+    hres = getCUIDFromTokenInfo(&tokenInfo, info->mCUID);
   /* shouldn't the be != S_SUCCESS? */
-  if (hres == E_FAIL) {
-    goto failed;
-  }
-
-  SECITEM_FreeItem(&ATR,PR_FALSE);
-  SECITEM_FreeItem(&label,PR_FALSE);
-  SECITEM_FreeItem(&isCOOLKey,PR_FALSE);
-
-  info->mSlot = PK11_ReferenceSlot(aSlot);
-  info->mSeries = PK11_GetSlotSeries(aSlot);
-  return info;
+    if (hres == E_FAIL) {
+        goto failed;
+    }
 
-failed:
-  if (ATR.data) {
     SECITEM_FreeItem(&ATR,PR_FALSE);
-  }
-  if (label.data) {
     SECITEM_FreeItem(&label,PR_FALSE);
-  }
-  if (obj) {
-    PK11_DestroyGenericObjects(obj);
-  }
-  if (info) {
-    delete info;
-  }
-  return NULL;
+    SECITEM_FreeItem(&isCOOLKey,PR_FALSE);
+
+    info->mSlot = PK11_ReferenceSlot(aSlot);
+    info->mSeries = PK11_GetSlotSeries(aSlot);
+    return info;
+
+failed:
+    if (ATR.data) {
+        SECITEM_FreeItem(&ATR,PR_FALSE);
+    }
+    if (label.data) {
+        SECITEM_FreeItem(&label,PR_FALSE);
+    }
+    if (obj) {
+        PK11_DestroyGenericObjects(obj);
+    }
+    if (info) {
+      delete info;
+    }
+    return NULL;
 }



From fedora-directory-commits at redhat.com  Sat Feb 24 02:17:39 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:17:39 -0500
Subject: [Fedora-directory-commits] 
	esc/src/lib/coolkey CoolKeyHandler.h, 1.2, 1.3
Message-ID: <200702240217.l1O2HdGH002184@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2168

Modified Files:
	CoolKeyHandler.h 
Log Message:
Change a few method prototypes .



Index: CoolKeyHandler.h
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKeyHandler.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoolKeyHandler.h	27 Sep 2006 17:47:46 -0000	1.2
+++ CoolKeyHandler.h	24 Feb 2007 02:17:37 -0000	1.3
@@ -146,6 +146,7 @@
   void Release();
 
   HRESULT SetAuthParameter(const char *param_id, const char *value);
+  HRESULT CancelAuthParameters();
   HRESULT SetScreenName(const char *screenName);
   HRESULT SetPassword(const char *password);
   HRESULT SetTokenPin(const char *pin);
@@ -242,11 +243,11 @@
 
   HRESULT HttpSendSecurID(eCKMessage_SECURID_REQUEST *req);
   HRESULT HttpSendNewPin(eCKMessage_NEWPIN_REQUEST * req);
-  HRESULT HttpSendAuthResponse(eCKMessage_EXTENDED_LOGIN_REQUEST *req);
+  HRESULT HttpSendAuthResponse(CoolKeyHandler *context,eCKMessage_EXTENDED_LOGIN_REQUEST *req);
   HRESULT HttpBeginOpRequest();
   HRESULT HttpSendUsernameAndPW();
   HRESULT HttpProcessStatusUpdate(eCKMessage_STATUS_UPDATE_REQUEST * msg);
-  HRESULT HttpOnDisconnect();
+  HRESULT HttpDisconnect(int reason=0);
 
   static void HttpProcessTokenPDU(CoolKeyHandler *context,eCKMessage_TOKEN_PDU_REQUEST *req);
   static void HttpProcessEndOp(CoolKeyHandler* context, eCKMessage_END_OP *end);



From fedora-directory-commits at redhat.com  Sat Feb 24 02:19:46 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:19:46 -0500
Subject: [Fedora-directory-commits] esc/src/lib/coolkey CoolKey_Message.cpp,
	1.2, 1.3
Message-ID: <200702240219.l1O2JkcT002320@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2302

Modified Files:
	CoolKey_Message.cpp 
Log Message:
Add time stamp to log files.



Index: CoolKey_Message.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey_Message.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoolKey_Message.cpp	27 Sep 2006 17:47:46 -0000	1.2
+++ CoolKey_Message.cpp	24 Feb 2007 02:19:44 -0000	1.3
@@ -19,8 +19,10 @@
 
 #include "nspr.h"
 #include "CoolKey_Message.h"
+#include "CoolKey.h"
 #include "math.h"
 #include <iostream>
+#include <time.h>
 
 PRLogModuleInfo *nkeyLogMS = PR_NewLogModule("coolKeyMessage");
 
@@ -29,7 +31,7 @@
 
 void eCKMessage::CreateTokenMap(vector<string> &aTokens)
 {
-  CreateTokenMap(mTokenMap,aTokens);
+    CreateTokenMap(mTokenMap,aTokens);
 }
 
 void eCKMessage::CreateTokenMap(map<string,string> &aTokenMap, vector<string> &aTokens)
@@ -54,7 +56,6 @@
         aTokenMap[curKey] = curValue;
   
         //cout << "key = " << curKey << " value = " << curValue << " \n" << endl;
-
     }
 
 }
@@ -226,7 +227,6 @@
     {
          *aSize = 0;
          return;
-
     }
 
     int input_size = *aSize;
@@ -250,7 +250,6 @@
     string  value =  mTokenMap[aKey];
 
     return atoi(value.c_str());
-
 }
 
 string &eCKMessage::getStringValue(string &aKey)
@@ -286,12 +285,11 @@
    *aSize = output_size;
 
    //printf("output %s \n",decode_output);
-
 }
 
 const char *eCKMessage::getMESSAGETypeAsString()
 {
-	return getMESSAGETypeAsString(message_type);
+    return getMESSAGETypeAsString(message_type);
 }
 
 const char *eCKMessage::getMESSAGETypeAsString(sntype type)
@@ -318,7 +316,7 @@
     default:  st = "unknown";
     }
 
-	return st;
+    return st;
 }
 
 eCKMessage_EXTENDED_LOGIN_REQUEST::eCKMessage_EXTENDED_LOGIN_REQUEST()
@@ -327,8 +325,8 @@
 
 eCKMessage_EXTENDED_LOGIN_REQUEST::~eCKMessage_EXTENDED_LOGIN_REQUEST()
 {
-
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_EXTENDED_LOGIN_REQUEST::~eCKMessage_EXTENDED_LOGIN_REQUEST \n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_EXTENDED_LOGIN_REQUEST::~eCKMessage_EXTENDED_LOGIN_REQUEST \n",GetTStamp(tBuff,56)));
 }
 
 void eCKMessage_EXTENDED_LOGIN_REQUEST::encode(string &aOutputVal)
@@ -388,8 +386,6 @@
 {
 }
 
-    
-
 nsNKeyREQUIRED_PARAMETERS_LIST::~nsNKeyREQUIRED_PARAMETERS_LIST()
 {
     CleanUp();
@@ -402,7 +398,6 @@
     if(new_parameter)
     {
        mParameters.push_back(new_parameter);
-
     }
     return new_parameter;
 }
@@ -415,7 +410,6 @@
         return NULL;
 
     return mParameters.at(index);
-
 }
 nsNKeyREQUIRED_PARAMETER *nsNKeyREQUIRED_PARAMETERS_LIST::GetById(string &aId)
 {
@@ -435,7 +429,6 @@
 
             if(tId == aId)
                 return curParam;
-
         }        
 
     }
@@ -444,47 +437,38 @@
 
 void nsNKeyREQUIRED_PARAMETERS_LIST::CleanUp()
 {
-
     vector<nsNKeyREQUIRED_PARAMETER *>::iterator i;
-
     nsNKeyREQUIRED_PARAMETER * curParam = NULL;
 
-
     for(i = mParameters.begin(); i!= mParameters.end(); i++)
     {
-
         curParam = (*i);
 
         if(curParam)
             delete curParam;
 
         curParam = NULL;
-
     }
 
-
     mParameters.clear();
-
 }
 
 int nsNKeyREQUIRED_PARAMETERS_LIST::AreAllParametersSet()
 {
-
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("nsNKeyREQUIRED_PARAMETERS_LIST::AreAllParametersSet:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s nsNKeyREQUIRED_PARAMETERS_LIST::AreAllParametersSet:\n",GetTStamp(tBuff,56)));
 
     int done = 0;
-
     int num_params = GetNumParameters();
 
     for(int i = 0; i < num_params ; i++)
     {
         nsNKeyREQUIRED_PARAMETER *curParam = GetAt(i);
-
         if(curParam)
         {
             if( !curParam->hasValueAttempted())
             {
-                PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("nsNKeyREQUIRED_PARAMETERS_LIST::AreAllParametersSet found parameter not set: index %d\n",i));
+                PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s nsNKeyREQUIRED_PARAMETERS_LIST::AreAllParametersSet found parameter not set: index %d\n",GetTStamp(tBuff,56),i));
 
                 return done;
             } 
@@ -492,17 +476,13 @@
     }
 
     done = 1;
- 
     return done;
 }
 
 void nsNKeyREQUIRED_PARAMETERS_LIST::EmitToBuffer(string &aOutputBuff)
 {
-
     aOutputBuff = "";
-
     string separater = "&&";
-
     int num_params = GetNumParameters();
 
     for(int i = 0 ; i < num_params ; i++)
@@ -513,9 +493,7 @@
          {
              string raw = curParam->GetRawText();
              aOutputBuff += raw + separater;
-
          }
-
     }
 
     int size = aOutputBuff.size();
@@ -525,17 +503,18 @@
         aOutputBuff.erase(size - 1);
         aOutputBuff.erase(size - 2);
     }
-
 }
 eCKMessage_LOGIN_REQUEST::eCKMessage_LOGIN_REQUEST() 
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_LOGIN_REQUEST::eCKMessage_LOGIN_REQUEST:\n"));
+    char tBuff[56]; 
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_LOGIN_REQUEST::eCKMessage_LOGIN_REQUEST:\n",GetTStamp(tBuff,56)));
     message_type = LOGIN_REQUEST; 
 }
 
 eCKMessage_LOGIN_REQUEST:: ~eCKMessage_LOGIN_REQUEST()
 {
-   PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_LOGIN_REQUEST::~eCKMessage_LOGIN_REQUEST:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_LOGIN_REQUEST::~eCKMessage_LOGIN_REQUEST:\n",GetTStamp(tBuff,56)));
 }
 
 void eCKMessage_LOGIN_REQUEST::encode(string &aOutputVal)
@@ -545,19 +524,21 @@
 
 void eCKMessage_LOGIN_REQUEST::decode(string &aInputVal) 
 {
-  eCKMessage::decode(aInputVal);
+    eCKMessage::decode(aInputVal);
 }
 
 eCKMessage_LOGIN_RESPONSE::eCKMessage_LOGIN_RESPONSE()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_LOGIN_RESPONSE::eCKMessage_LOGIN_RESPONSE:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_LOGIN_RESPONSE::eCKMessage_LOGIN_RESPONSE:\n",GetTStamp(tBuff,56)));
 
     message_type = LOGIN_RESPONSE;
 }
 
 eCKMessage_LOGIN_RESPONSE:: ~eCKMessage_LOGIN_RESPONSE()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_LOGIN_RESPONSE::~eCKMessage_LOGIN_RESPONSE:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_LOGIN_RESPONSE::~eCKMessage_LOGIN_RESPONSE:\n",GetTStamp(tBuff,56)));
 }
 
 void eCKMessage_LOGIN_RESPONSE::decode(string &aInputVal) 
@@ -582,21 +563,21 @@
     aOutputVal += sKey + delim1 + lScreenName + delim + pKey + delim1 + lPassword;
 
     eCKMessage::encode(aOutputVal);
-
 }
 
 eCKMessage_EXTENDED_LOGIN_RESPONSE::eCKMessage_EXTENDED_LOGIN_RESPONSE()
 {
-  PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_EXTENDED_LOGIN_RESPONSE::eCKMessage_EXTENDED_LOGIN_RESPONSE:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_EXTENDED_LOGIN_RESPONSE::eCKMessage_EXTENDED_LOGIN_RESPONSE:\n",GetTStamp(tBuff,56)));
 
-   message_type = EXTENDED_LOGIN_RESPONSE;
-   paramList = NULL;
+    message_type = EXTENDED_LOGIN_RESPONSE;
+    paramList = NULL;
 }
 
 eCKMessage_EXTENDED_LOGIN_RESPONSE:: ~eCKMessage_EXTENDED_LOGIN_RESPONSE()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_EXTENDED_LOGIN_RESPONSE::~eCKMessage_EXTENDED_LOGIN_RESPONSE:\n"));
-
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_EXTENDED_LOGIN_RESPONSE::~eCKMessage_EXTENDED_LOGIN_RESPONSE:\n",GetTStamp(tBuff,56)));
 }
 
 void eCKMessage_EXTENDED_LOGIN_RESPONSE::decode(string &aInputVal) 
@@ -635,9 +616,7 @@
 
             if(i < (num_parameters - 1))
                 aOutputVal += delim;
- 
         } 
-
     }
 
     //cout << "nsNKeyMESSGE_EXTENDED_LOGIN_RESPONSE::encode " << aOutputVal + "\n" << endl;
@@ -647,15 +626,16 @@
 
 eCKMessage_SECURID_REQUEST::eCKMessage_SECURID_REQUEST() 
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_SECURID_REQUEST::eCKMessage_SECURID_REQUEST:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_SECURID_REQUEST::eCKMessage_SECURID_REQUEST:\n",GetTStamp(tBuff,56)));
 
     message_type = SECURID_REQUEST;
 }
 
 eCKMessage_SECURID_REQUEST::~eCKMessage_SECURID_REQUEST()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_SECURID_REQUEST::~eCKMessage_SECURID_REQUEST:\n"));
-
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_SECURID_REQUEST::~eCKMessage_SECURID_REQUEST:\n",GetTStamp(tBuff,56)));
 }
 
 void eCKMessage_SECURID_REQUEST::encode(string &aOutputVal)
@@ -665,20 +645,20 @@
 
 void eCKMessage_SECURID_REQUEST::decode(string &aInputVal) 
 {
-      eCKMessage::decode(aInputVal);
-
+    eCKMessage::decode(aInputVal);
 }
 eCKMessage_SECURID_RESPONSE::eCKMessage_SECURID_RESPONSE() 
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_SECURID_RESPONSE::eCKMessage_SECURID_RESPONSE:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_SECURID_RESPONSE::eCKMessage_SECURID_RESPONSE:\n",GetTStamp(tBuff,56)));
 
     message_type = SECURID_RESPONSE;
 }
 
 eCKMessage_SECURID_RESPONSE::~eCKMessage_SECURID_RESPONSE()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_SECURID_RESPONSE::~eCKMessage_SECURID_RESPONSE:\n"));
-
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_SECURID_RESPONSE::~eCKMessage_SECURID_RESPONSE:\n",GetTStamp(tBuff,56)));
 }
 
 void eCKMessage_SECURID_RESPONSE::decode(string &aInputVal)
@@ -703,20 +683,20 @@
     aOutputVal += keyPin + delim1 + lPin + delim + keyValue + delim1 + lValue ;
 
     eCKMessage::encode(aOutputVal);
-
 }
 
 eCKMessage_NEWPIN_REQUEST::eCKMessage_NEWPIN_REQUEST()
- 
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_NEWPIN_REQUEST::eCKMessage_NEWPIN_REQUEST:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_NEWPIN_REQUEST::eCKMessage_NEWPIN_REQUEST:\n",GetTStamp(tBuff,56)));
 
     message_type = NEW_PIN_REQUEST;
 }
 
 eCKMessage_NEWPIN_REQUEST::~eCKMessage_NEWPIN_REQUEST()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_NEWPIN_REQUEST::~eCKMessage_NEWPIN_REQUEST:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_NEWPIN_REQUEST::~eCKMessage_NEWPIN_REQUEST:\n",GetTStamp(tBuff,56)));
 }
 
 void eCKMessage_NEWPIN_REQUEST::encode(string &aOutputVal)
@@ -730,15 +710,18 @@
 }
 eCKMessage_NEWPIN_RESPONSE::eCKMessage_NEWPIN_RESPONSE() 
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_NEWPIN_RESPONSE::eCKMessage_NEWPIN_RESPONSE:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_NEWPIN_RESPONSE::eCKMessage_NEWPIN_RESPONSE:\n",GetTStamp(tBuff,56)));
 
     message_type = NEW_PIN_RESPONSE;
 }
 
 eCKMessage_NEWPIN_RESPONSE::~eCKMessage_NEWPIN_RESPONSE()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_NEWPIN_RESPONSE::~eCKMessage_NEWPIN_RESPONSE:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_NEWPIN_RESPONSE::~eCKMessage_NEWPIN_RESPONSE:\n",GetTStamp(tBuff,56)));
 }
+ 
 
 void eCKMessage_NEWPIN_RESPONSE::decode(string &aInputVal)
 {
@@ -764,14 +747,16 @@
 
 eCKMessage_TOKEN_PDU_REQUEST::eCKMessage_TOKEN_PDU_REQUEST() 
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_TOKEN_PDU_REQUEST::eCKMessage_TOKEN_PDU_REQUEST:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_TOKEN_PDU_REQUEST::eCKMessage_TOKEN_PDU_REQUEST:\n",GetTStamp(tBuff,56)));
 
     message_type = TOKEN_PDU_REQUEST;
 }
 
 eCKMessage_TOKEN_PDU_REQUEST::~eCKMessage_TOKEN_PDU_REQUEST()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_TOKEN_PDU_REQUEST::~eCKMessage_TOKEN_PDU_REQUEST:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_TOKEN_PDU_REQUEST::~eCKMessage_TOKEN_PDU_REQUEST:\n",GetTStamp(tBuff,56)));
 
 }
 
@@ -787,14 +772,16 @@
  
 eCKMessage_TOKEN_PDU_RESPONSE::eCKMessage_TOKEN_PDU_RESPONSE() 
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_TOKEN_PDU_RESPONSE::eCKMessage_TOKEN_PDU_RESPONSE:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_TOKEN_PDU_RESPONSE::eCKMessage_TOKEN_PDU_RESPONSE:\n",GetTStamp(tBuff,56)));
 
     message_type = TOKEN_PDU_RESPONSE;
 }
 
 eCKMessage_TOKEN_PDU_RESPONSE::~eCKMessage_TOKEN_PDU_RESPONSE()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_TOKEN_PDU_RESPONSE::~eCKMessage_TOKEN_PDU_RESPONSE:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_TOKEN_PDU_RESPONSE::~eCKMessage_TOKEN_PDU_RESPONSE:\n",GetTStamp(tBuff,56)));
 }
 
 void eCKMessage_TOKEN_PDU_RESPONSE::decode(string &aInputVal)
@@ -825,14 +812,14 @@
 
 eCKMessage_STATUS_UPDATE_REQUEST:: ~eCKMessage_STATUS_UPDATE_REQUEST()
 {
-
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_STATUS_UPDATE_REQUEST::~eCKMessage_STATUS_UPDATE_REQUEST:\n"));
-
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_STATUS_UPDATE_REQUEST::~eCKMessage_STATUS_UPDATE_REQUEST:\n",GetTStamp(tBuff,56)));
 }
 
 eCKMessage_STATUS_UPDATE_REQUEST::eCKMessage_STATUS_UPDATE_REQUEST() 
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_STATUS_UPDATE_REQUEST::eCKMessage_STATUS_UPDATE_REQUEST:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_STATUS_UPDATE_REQUEST::eCKMessage_STATUS_UPDATE_REQUEST:\n",GetTStamp(tBuff,56)));
 
     message_type = STATUS_UPDATE_REQUEST;
 }
@@ -848,20 +835,20 @@
 }
 eCKMessage_STATUS_UPDATE_RESPONSE:: ~eCKMessage_STATUS_UPDATE_RESPONSE()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_STATUS_UPDATE_RESPONSE::~eCKMessage_STATUS_UPDATE_RESPONSE:\n"));
-
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_STATUS_UPDATE_RESPONSE::~eCKMessage_STATUS_UPDATE_RESPONSE:\n",GetTStamp(tBuff,56)));
 }
 
 eCKMessage_STATUS_UPDATE_RESPONSE::eCKMessage_STATUS_UPDATE_RESPONSE()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_STATUS_UPDATE_RESPONSE::eCKMessage_STATUS_UPDATE_RESPONSE:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_STATUS_UPDATE_RESPONSE::eCKMessage_STATUS_UPDATE_RESPONSE:\n",GetTStamp(tBuff,56)));
 
     message_type = STATUS_UPDATE_RESPONSE;
 }
 
 void eCKMessage_STATUS_UPDATE_RESPONSE::decode(string &aInputVal)
 {
-
 }
 
 void eCKMessage_STATUS_UPDATE_RESPONSE::encode(string &aOutputVal)
@@ -877,21 +864,21 @@
 
     int currentState = getIntValue(key);
 
-    aOutputVal += delim1 +  intToString(currentState);
+    aOutputVal += key + delim1 +  intToString(currentState);
 
     eCKMessage::encode(aOutputVal);
-
 }
 
 eCKMessage_END_OP::eCKMessage_END_OP() 
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_END_OP::eCKMessage_END_OP:\n"));
-
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_END_OP::eCKMessage_END_OP:\n",GetTStamp(tBuff,56)));
     message_type = END_OP;
 }
 eCKMessage_END_OP::~eCKMessage_END_OP()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_END_OP::~eCKMessage_END_OP:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_END_OP::~eCKMessage_END_OP:\n",GetTStamp(tBuff,56)));
 }
 
 void eCKMessage_END_OP::encode(string &aOutputVal)
@@ -905,14 +892,16 @@
 
 eCKMessage_BEGIN_OP::eCKMessage_BEGIN_OP()
 {
-  PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_BEGIN_OP::eCKMessage_BEGIN_OP:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_BEGIN_OP::eCKMessage_BEGIN_OP:\n",GetTStamp(tBuff,56)));
 
     message_type = BEGIN_OP;
 }
 
 eCKMessage_BEGIN_OP::~eCKMessage_BEGIN_OP()
 {
-    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("eCKMessage_BEGIN_OP::~eCKMessage_BEGIN_OP:\n"));
+    char tBuff[56];
+    PR_LOG( nkeyLogMS, PR_LOG_DEBUG, ("%s eCKMessage_BEGIN_OP::~eCKMessage_BEGIN_OP:\n",GetTStamp(tBuff,56)));
 
 }
 
@@ -1109,8 +1098,6 @@
         }
         *cur = '\0'; // null-terminated
 }
-
-
 nsNKeyREQUIRED_PARAMETER::~nsNKeyREQUIRED_PARAMETER()
 {
 }



From fedora-directory-commits at redhat.com  Sat Feb 24 02:20:24 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:20:24 -0500
Subject: [Fedora-directory-commits] esc/src/lib/coolkey NSSManager.cpp, 1.2,
	1.3
Message-ID: <200702240220.l1O2KOhI002347@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2331

Modified Files:
	NSSManager.cpp 
Log Message:
Add time stamps to log messages.



Index: NSSManager.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/NSSManager.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NSSManager.cpp	27 Sep 2006 17:47:46 -0000	1.2
+++ NSSManager.cpp	24 Feb 2007 02:20:22 -0000	1.3
@@ -40,8 +40,7 @@
 #include "keyhi.h"
 
 #include <iostream>
- #include <sstream>
-
+#include <sstream>
 
 #include "SlotUtils.h"
 
@@ -49,146 +48,148 @@
 
 NSSManager::NSSManager()
 {
-    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::NSSManager:\n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::NSSManager:\n",GetTStamp(tBuff,56)));
     mpSCMonitoringThread = NULL;
 }
 
 NSSManager::~NSSManager()
 {
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::~NSSManager:\n"));
-  if (mpSCMonitoringThread) {
-    delete mpSCMonitoringThread;
-    mpSCMonitoringThread = NULL;
-  }
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::~NSSManager:\n",GetTStamp(tBuff,56)));
+    if (mpSCMonitoringThread) {
+        delete mpSCMonitoringThread;
+        mpSCMonitoringThread = NULL;
+    }
 }
 
 HRESULT NSSManager::InitNSS(const char *aAppDir)
 {
   // Init NSS
 
-  PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("Initializing the NSS Crypto Library. \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("%s Initializing the NSS Crypto Library. \n",GetTStamp(tBuff,56)));
 
+    if(aAppDir)
+    {
+        SECStatus status =  NSS_Init(aAppDir);
 
-  if(aAppDir)
-  {
-      SECStatus status =  NSS_Init(aAppDir);
-
-      PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS:\n"));
-      if(status != SECSuccess)
-      {
-          PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS: db init failed try simple init.\n"));
-	  status = NSS_NoDB_Init(NULL);
+        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s InitNSS:\n",GetTStamp(tBuff,56)));
+        if(status != SECSuccess)
+        {
+            PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s InitNSS: db init failed try simple init.\n",GetTStamp(tBuff,56)));
+	    status = NSS_NoDB_Init(NULL);
 
-          PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS: tried NSS_NoDB_Init res %d .\n",status));
+            PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s InitNSS: tried NSS_NoDB_Init res %d .\n",GetTStamp(tBuff,56),status));
 
-	  if(status != SECSuccess)
-          {
-                PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS:Simple init failed.\n"));
+	    if(status != SECSuccess)
+            {
+                PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s InitNSS:Simple init failed.\n",GetTStamp(tBuff,56)));
 		return E_FAIL;
-          }
-      }
-  }
-
-  char *libName = COOLKEY_PKCS11_LIBRARY ;
+            }
+        }
+    }
 
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS: About to try SECMOD_AddNewModule :%s \n",libName));
+    char *libName = COOLKEY_PKCS11_LIBRARY ;
 
-   char modSpec[512];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s InitNSS: About to try SECMOD_AddNewModule :%s \n",GetTStamp(tBuff,56),libName));
 
-   sprintf(modSpec,"library=\"%s\" name=\"%s\" parameters=\"%s\" NSS=\"slotParams={0x00000002=[slotFlags='PublicCerts']}\"\n",COOLKEY_PKCS11_LIBRARY,COOLKEY_NAME,PROMISCUOUS_PARAMETER);
+    char modSpec[512];
 
+    sprintf(modSpec,"library=\"%s\" name=\"%s\" parameters=\"%s\" NSS=\"slotParams={0x00000002=[slotFlags='PublicCerts']}\"\n",COOLKEY_PKCS11_LIBRARY,COOLKEY_NAME,PROMISCUOUS_PARAMETER);
 
-   PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS: modSpec %s\n",modSpec));
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s InitNSS: modSpec %s\n",GetTStamp(tBuff,56),modSpec));
 
-  SECMODModule *userModule = SECMOD_LoadUserModule(modSpec,NULL,0);
+    SECMODModule *userModule = SECMOD_LoadUserModule(modSpec,NULL,0);
 
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("InitNSS: Done SECMOD_LoadUserModule %p \n",userModule));
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s InitNSS: Done SECMOD_LoadUserModule %p \n",GetTStamp(tBuff,56),userModule));
 
-  if(!userModule || !userModule->loaded)
-  {
-      PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("NSSManager::InitNSS problem loading PKCS11 module. No keys will be recognized!\n"));
-      return E_FAIL;
-  }
+    if(!userModule || !userModule->loaded)
+    {
+        PR_LOG( coolKeyLogNSS, PR_LOG_ALWAYS, ("%s NSSManager::InitNSS problem loading PKCS11 module. No keys will be recognized!\n",GetTStamp(tBuff,56)));
+        return E_FAIL;
+    }
 
-  mpSCMonitoringThread = new SmartCardMonitoringThread(userModule);
-  if (!mpSCMonitoringThread) {
-    SECMOD_UnloadUserModule(userModule);
-    return E_FAIL;
-  }
-  mpSCMonitoringThread->Start();
+    mpSCMonitoringThread = new SmartCardMonitoringThread(userModule);
+    if (!mpSCMonitoringThread) {
+        SECMOD_UnloadUserModule(userModule);
+        return E_FAIL;
+    }
+    mpSCMonitoringThread->Start();
 
-  return S_OK;
+    return S_OK;
 }
 
 void NSSManager::Shutdown()
 {
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::Shutdown \n"));
-  if (mpSCMonitoringThread) {
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::Shutdown \n",GetTStamp(tBuff,56)));
+    if (mpSCMonitoringThread) {
 
-    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::Shutdown Stopping Smart Thread %p \n",mpSCMonitoringThread));
-    mpSCMonitoringThread->Stop();
-  }
+        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::Shutdown Stopping Smart Thread %p \n",GetTStamp(tBuff,56),mpSCMonitoringThread));
+        mpSCMonitoringThread->Stop();
+    }
   
   // Logout all tokens.
-  PK11_LogoutAll();
-
+    PK11_LogoutAll();
 }
 
 bool 
 NSSManager::AuthenticateCoolKey(const CoolKey *aKey, const char *aPIN)
 {
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::AuthenticateCoolKey \n"));
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::AuthenticateCoolKey \n",GetTStamp(tBuff,56)));
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
   
-  if (!slot)
-    return false;
+    if (!slot)
+        return false;
   
-  if (!PK11_IsPresent(slot)) {
-    PK11_FreeSlot(slot);
-    return false;
-  }
+    if (!PK11_IsPresent(slot)) {
+        PK11_FreeSlot(slot);
+        return false;
+    }
   
-  if (!PK11_NeedLogin(slot)) {
-    PK11_FreeSlot(slot);
-    return true;
-  }
+    if (!PK11_NeedLogin(slot)) {
+        PK11_FreeSlot(slot);
+        return true;
+    }
   
-  SECStatus status = PK11_CheckUserPassword(slot, (char *)aPIN);
-  PK11_FreeSlot(slot);
+    SECStatus status = PK11_CheckUserPassword(slot, (char *)aPIN);
+    PK11_FreeSlot(slot);
   
   // Note: SECWouldBlock means that the password was incorrect.
   //       SECFailure means NSS encountered a failure that couldn't
   //       be fixed by a retry.
   
-  bool didAuth = (status == SECSuccess);
+    bool didAuth = (status == SECSuccess);
   
-  return didAuth;
+    return didAuth;
 }
 
-
 HRESULT 
 NSSManager::GetSignatureLength(const CoolKey *aKey, int *aLength)
 {
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetSignatureLength \n"));
-  if (!aKey || !aKey->mKeyID || !aLength)
-    return E_FAIL;
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetSignatureLength \n",GetTStamp(tBuff,56)));
+    if (!aKey || !aKey->mKeyID || !aLength)
+        return E_FAIL;
   
-  *aLength = 0;
+    *aLength = 0;
   
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
-  if (!slot)
-    return E_FAIL;
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    if (!slot)
+        return E_FAIL;
   
-  SECKEYPrivateKey *privKey = GetAuthenticationPrivateKey(slot);
+    SECKEYPrivateKey *privKey = GetAuthenticationPrivateKey(slot);
   
-  if (!privKey)
-    return E_FAIL;
+    if (!privKey)
+        return E_FAIL;
   
-  *aLength = PK11_SignatureLen(privKey);
+    *aLength = PK11_SignatureLen(privKey);
   
-  PK11_FreeSlot(slot);
-  SECKEY_DestroyPrivateKey(privKey);
-  return S_OK;
+    PK11_FreeSlot(slot);
+    SECKEY_DestroyPrivateKey(privKey);
+    return S_OK;
 }
 
 HRESULT 
@@ -196,76 +197,75 @@
                             const unsigned char *aData, int aDataLen, 
                             unsigned char *aSignedData, int *aSignedDataLen)
 {
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::SignDataWithKey \n"));
-  if (!aKey || !aKey->mKeyID || !aData || aDataLen < 1 ||
-      !aSignedData || !aSignedDataLen)
-    return E_FAIL;
-  
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::SignDataWithKey \n",GetTStamp(tBuff,56)));
+    if (!aKey || !aKey->mKeyID || !aData || aDataLen < 1 ||
+          !aSignedData || !aSignedDataLen)
+        return E_FAIL;
   
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
-  if (!slot)
-    return E_FAIL;
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    if (!slot)
+        return E_FAIL;
   
-  SECKEYPrivateKey *privKey = GetAuthenticationPrivateKey(slot);
+    SECKEYPrivateKey *privKey = GetAuthenticationPrivateKey(slot);
   
-  if (!privKey)
-    return E_FAIL; 
+    if (!privKey)
+        return E_FAIL; 
   
   // Make sure the caller supplied us with a aSignedData
   // buffer that was large enough!
   
-  int sigLen = PK11_SignatureLen(privKey);
-  
-  if (sigLen > *aSignedDataLen)
-    return E_FAIL;
+    int sigLen = PK11_SignatureLen(privKey);
   
-  unsigned char digest[1024]; // How do I dynamically check the size needed?
-  unsigned int digestLen;
+    if (sigLen > *aSignedDataLen)
+        return E_FAIL;
   
-  PK11Context* DigestContext = PK11_CreateDigestContext(SEC_OID_SHA1);
-  SECStatus s = PK11_DigestBegin(DigestContext);
-  s = PK11_DigestOp(DigestContext, aData, aDataLen);
-  s = PK11_DigestFinal(DigestContext, digest, &digestLen, sizeof digest);
+    unsigned char digest[1024]; // How do I dynamically check the size needed?
+    unsigned int digestLen;
   
-  PK11_DestroyContext(DigestContext, PR_TRUE);
+    PK11Context* DigestContext = PK11_CreateDigestContext(SEC_OID_SHA1);
+    SECStatus s = PK11_DigestBegin(DigestContext);
+    s = PK11_DigestOp(DigestContext, aData, aDataLen);
+    s = PK11_DigestFinal(DigestContext, digest, &digestLen, sizeof digest);
   
-  SECItem sig, hash;
+    PK11_DestroyContext(DigestContext, PR_TRUE);
   
-  sig.data = aSignedData;
-  sig.len = *aSignedDataLen;
-  hash.data = digest;
-  hash.len = digestLen;
+    SECItem sig, hash;
   
-  s = PK11_Sign(privKey, &sig, &hash);
+    sig.data = aSignedData;
+    sig.len = *aSignedDataLen;
+    hash.data = digest;
+    hash.len = digestLen;
   
+    s = PK11_Sign(privKey, &sig, &hash);
   
-  PK11_FreeSlot(slot);
-  SECKEY_DestroyPrivateKey(privKey);
-  return S_OK;
+    PK11_FreeSlot(slot);
+    SECKEY_DestroyPrivateKey(privKey);
+    return S_OK;
 }
 HRESULT 
 NSSManager::GetKeyCertNicknames( const CoolKey *aKey,  vector<string> & aStrings  )
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyCertNickNames \n",GetTStamp(tBuff,56)));
 
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyCertNickNames \n"));
-
-  if(!aKey )
-  {
-    return E_FAIL;
-  }
+    if(!aKey )
+    {
+        return E_FAIL;
+    }
 
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
 
-  if (!slot)
-  {
-    return E_FAIL;
-  }
+    if (!slot)
+    {
+        return E_FAIL;
+    }
 
-  CERTCertList *certs = PK11_ListCerts(PK11CertListAll,NULL);
+    CERTCertList *certs = PK11_ListCerts(PK11CertListAll,NULL);
 
     if (!certs)
     {
-        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetCertNicknames no certs found! \n"));
+        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetCertNicknames no certs found! \n",GetTStamp(tBuff,56)));
         PK11_FreeSlot(slot);
         return E_FAIL;
     }
@@ -285,17 +285,15 @@
                 }
             }
         }
-
     }
 
+    if (!certs)
+    {
+        PK11_FreeSlot(slot);
+        return E_FAIL;
+    }
 
-  if (!certs)
-  {
-    PK11_FreeSlot(slot);
-    return E_FAIL;
-  }
-
-   CERTCertNicknames *nicknames =
+    CERTCertNicknames *nicknames =
     CERT_NicknameStringsFromCertList(certs,
                                      NICKNAME_EXPIRED_STRING,
                                      NICKNAME_NOT_YET_VALID_STRING);
@@ -310,38 +308,33 @@
         {
             curName = nicknames->nicknames[i];
 
-            PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetCertKeyNicknames name %s \n",curName));
+            PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetCertKeyNicknames name %s \n",GetTStamp(tBuff,56),curName));
 
             string str = curName;
             aStrings.push_back (str);
         } 
 
-
         CERT_FreeNicknames(nicknames);
-        
     }
 
     if(certs)
-      CERT_DestroyCertList(certs);
+        CERT_DestroyCertList(certs);
 
     if(slot)
-      PK11_FreeSlot(slot);
-
-    
+        PK11_FreeSlot(slot);
     
     return S_OK;
-
 }
 
 HRESULT NSSManager::GetKeyIssuedTo(const CoolKey *aKey, char *aBuf, int aBufLength)
 {
-
+    char tBuff[56];
     if(!aBuf)
         return E_FAIL;
 
     aBuf[0]=0;
 
-    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyIssuedTo \n"));
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo \n",GetTStamp(tBuff,56)));
 
     if(!aKey )
     {
@@ -355,12 +348,11 @@
         return E_FAIL;
     }
 
-
     CERTCertList *certs = PK11_ListCerts(PK11CertListAll,NULL);
 
     if (!certs)
     {
-        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyIssuedTo no certs found! \n"));
+        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%sNSSManager::GetKeyIssuedTo no certs found! \n",GetTStamp(tBuff,56)));
         PK11_FreeSlot(slot);
         return E_FAIL;
     }
@@ -369,7 +361,6 @@
 
     char *certID = NULL;
 
-
     for( node = CERT_LIST_HEAD(certs);
              ! CERT_LIST_END(node, certs);
              node = CERT_LIST_NEXT(node))     
@@ -380,13 +371,10 @@
 
             if(cert)
             {
-
-
                 if(cert->slot == slot)
                 {
-        
                     certID = CERT_GetCommonName(&cert->subject);
-                    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyIssuedTo ourSlot %p curSlot  %p certID %s \n",slot,cert->slot,certID));
+                    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyIssuedTo ourSlot %p curSlot  %p certID %s \n",GetTStamp(tBuff,56),slot,cert->slot,certID));
 
                 }
 
@@ -416,40 +404,40 @@
 
 HRESULT NSSManager::GetKeyCertInfo(const CoolKey *aKey, char *aCertNickname, string & aCertInfo)
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyCertInfo Nickname %s \n",GetTStamp(tBuff,56),aCertNickname));
 
-   PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyCertInfo Nickname %s \n",aCertNickname));
-
-  aCertInfo = "";
+    aCertInfo = "";
 
-  if(!aKey )
-  {
-    return E_FAIL;
-  }
+    if(!aKey )
+    {
+        return E_FAIL;
+    }
 
-  if(!aCertNickname)
-  {
-      return E_FAIL;
-  }
+    if(!aCertNickname)
+    {
+        return E_FAIL;
+    }
 
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
 
-  if (!slot)
-  {
-    return E_FAIL;
-  }
+    if (!slot)
+    {
+        return E_FAIL;
+    }
 
-  CERTCertList *certs = PK11_ListCerts(PK11CertListAll,NULL);
+    CERTCertList *certs = PK11_ListCerts(PK11CertListAll,NULL);
 
-  if (!certs)
-  {
-    if(slot)
-        PK11_FreeSlot(slot);
-    return E_FAIL;
-  }
+    if (!certs)
+    {
+        if(slot)
+            PK11_FreeSlot(slot);
+        return E_FAIL;
+    }
 
-  PR_LOG(coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyCertInfo About to get CertList for slot. \n"));
+    PR_LOG(coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyCertInfo About to get CertList for slot. \n",GetTStamp(tBuff,56)));
 
-  CERTCertListNode *node= NULL;
+    CERTCertListNode *node= NULL;
     for( node = CERT_LIST_HEAD(certs);
              ! CERT_LIST_END(node, certs);
              node = CERT_LIST_NEXT(node))
@@ -463,7 +451,7 @@
                 {
                     if(!strcmp(cert->nickname,aCertNickname))
                     {
-                        PR_LOG(coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyCertInfo We have a matching cert to our slot. nickname %s \n",cert->nickname));
+                        PR_LOG(coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyCertInfo We have a matching cert to our slot. nickname %s \n",GetTStamp(tBuff,56),cert->nickname));
 
                         char *issuerCN   = NULL;
                         char *issuedToCN = NULL;
@@ -485,16 +473,13 @@
 
                         char *nBefore = (char *) DER_UTCTimeToAscii(&cert->validity.notBefore);
                         char  *nAfter  = (char *) DER_UTCTimeToAscii(&cert->validity.notAfter);
-
-
  
                         if(nBefore)
                             notBeforeStr = nBefore;
                         if(nAfter)
                             notAfterStr  = nAfter;
 
-                        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyCertInfo notBefore %s notAfter %s \n",nBefore, nAfter));
-
+                        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyCertInfo notBefore %s notAfter %s \n",GetTStamp(tBuff,56),nBefore, nAfter));
 
                         int serialNumber = DER_GetInteger(&cert->serialNumber);
 
@@ -505,9 +490,8 @@
 
                         aCertInfo = issuedToCNStr + "\n" + issuerCNStr + "\n"
                             + notBeforeStr + "\n" + notAfterStr + "\n" + serialStr ;
-                        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyCertInfo issuerCN %s issuedToCN %s \n",issuerCN, issuedToCN)); 
+                        PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyCertInfo issuerCN %s issuedToCN %s \n",GetTStamp(tBuff,56),issuerCN, issuedToCN)); 
 
-                        
                         break;
                     }               
                 }
@@ -515,201 +499,131 @@
         }
     }
 
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyCertInfo info: %s \n",aCertInfo.c_str())); 
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyCertInfo info: %s \n",GetTStamp(tBuff,56),aCertInfo.c_str())); 
 
-  if(certs)
-      CERT_DestroyCertList(certs);
+    if(certs)
+        CERT_DestroyCertList(certs);
 
-   if(slot)
-      PK11_FreeSlot(slot);
+    if(slot)
+        PK11_FreeSlot(slot);
 
-  return S_OK;
+    return S_OK;
 }
 
 HRESULT
 NSSManager::GetKeyPolicy(const CoolKey *aKey, char *aBuf, int aBufLength)
 {
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::GetKeyPolicy \n"));
-  aBuf[0] = '\0';
-  char* carot = aBuf;
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::GetKeyPolicy \n",GetTStamp(tBuff,56)));
+    aBuf[0] = '\0';
+    char* carot = aBuf;
 
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
  
-  if (!slot)
-    return E_FAIL;
+    if (!slot)
+        return E_FAIL;
  
-  CERTCertListNode *node;
-  CERTCertList *certs = PK11_ListCertsInSlot(slot);
-  if (!certs)
-    return E_FAIL;;
-
-  for (node = CERT_LIST_HEAD(certs); !CERT_LIST_END(node,certs); node = CERT_LIST_NEXT(node)) {
-    SECItem policyItem;
-    policyItem.data = 0;
+    CERTCertListNode *node;
+    CERTCertList *certs = PK11_ListCertsInSlot(slot);
+    if (!certs)
+        return E_FAIL;;
+
+    for (node = CERT_LIST_HEAD(certs); !CERT_LIST_END(node,certs); node = CERT_LIST_NEXT(node)) {
+        SECItem policyItem;
+        policyItem.data = 0;
    
-    SECStatus s = CERT_FindCertExtension(node->cert, SEC_OID_X509_CERTIFICATE_POLICIES, &policyItem);
+        SECStatus s = CERT_FindCertExtension(node->cert, SEC_OID_X509_CERTIFICATE_POLICIES, &policyItem);
 
-    if (s != SECSuccess || !policyItem.data)
-      continue;
+        if (s != SECSuccess || !policyItem.data)
+            continue;
 
-    CERTCertificatePolicies *policies = CERT_DecodeCertificatePoliciesExtension(&policyItem);
+        CERTCertificatePolicies *policies = CERT_DecodeCertificatePoliciesExtension(&policyItem);
 
-    if (!policies) {
-      PORT_Free(policyItem.data);
-      continue;
-    }
+        if (!policies) {
+            PORT_Free(policyItem.data);
+            continue;
+        }
 
-    CERTPolicyInfo **policyInfos = policies->policyInfos;
+        CERTPolicyInfo **policyInfos = policies->policyInfos;
 
-    while (*policyInfos) {
-      char *policyID = CERT_GetOidString(&(*policyInfos)->policyID);
-      int policyLen = (int)strlen(policyID);
+        while (*policyInfos) {
+            char *policyID = CERT_GetOidString(&(*policyInfos)->policyID);
+            int policyLen = (int)strlen(policyID);
 
       // check to see if there is space.  we substract an extra -1 for the comma
-      if (aBufLength - policyLen - 1 >=0) {
+            if (aBufLength - policyLen - 1 >=0) {
 
         // if this policy ID isn't in the buffer, add it.
 
-        if (!strstr(aBuf, policyID)) {
+                if (!strstr(aBuf, policyID)) {
 
           // assuming that this isn't the start, add our delimiter
-          if (carot != aBuf)
-              strcat(carot++, ",");
+                    if (carot != aBuf)
+                        strcat(carot++, ",");
 
           // Add the policy id
-          strcat(carot, policyID);
-          carot += policyLen;
+                    strcat(carot, policyID);
+                    carot += policyLen;
 
           // decrement the length of the availability space in the |in| buffer.
-          aBufLength -= (policyLen + 1);
+                    aBufLength -= (policyLen + 1);
+                }
+            }
+          policyInfos++;
+          PR_smprintf_free(policyID);
         }
-      }
-      policyInfos++;
-      PR_smprintf_free(policyID);
-    }
-
-    PORT_Free(policyItem.data);
-    CERT_DestroyCertificatePoliciesExtension(policies);
-  }
-
-  CERT_DestroyCertList(certs);
-  PK11_FreeSlot(slot);
-  return S_OK;
-  }
-
-/*
-
-
-HRESULT 
-NSSManager::GetKeyPolicy(const CoolKey *aKey, char *aBuf, int aBufLength)
-{
-  aBuf[0] = '\0';
-  char* carot = aBuf;
 
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
-  
-  if (!slot)
-    return E_FAIL;
-  
-  CERTCertListNode *node;
-  CERTCertList *certs = PK11_ListCertsInSlot(slot);
-  if (!certs) 
-    return E_FAIL;;
-  
-  for (node = CERT_LIST_HEAD(certs); !CERT_LIST_END(node,certs); node = CERT_LIST_NEXT(node)) {
-    SECItem policyItem;
-    policyItem.data = 0;
-    
-    SECStatus s = CERT_FindCertExtension(node->cert, SEC_OID_X509_CERTIFICATE_POLICIES, &policyItem);
-    
-    if (s != SECSuccess || !policyItem.data) 
-      continue;
-    
-    CERTCertificatePolicies *policies = CERT_DecodeCertificatePoliciesExtension(&policyItem);
-    
-    if (!policies) {
       PORT_Free(policyItem.data);
-      continue;
+      CERT_DestroyCertificatePoliciesExtension(policies);
     }
-    
-    CERTPolicyInfo **policyInfos = policies->policyInfos;
-    
-    while (*policyInfos) {
-      char *policyID = CERT_GetOidString(&(*policyInfos)->policyID);
-      int policyLen = (int)strlen(policyID);
-
-      // check to see if there is space.  we substract an extra -1 for the comma
-      if (aBufLength - policyLen - 1 >=0) {
-
-        // if this policy ID isn't in the buffer, add it. 
-        if (!strstr(aBuf, policyID)) {
-          
-          // assuming that this isn't the start, add our delimiter
-          if (carot != aBuf)
-              strcat(carot++, ",");
 
-          // Add the policy id
-          strcat(carot++, policyID);
+    CERT_DestroyCertList(certs);
+    PK11_FreeSlot(slot);
+    return S_OK;
+}
 
-          // decrement the length of the availability space in the |in| buffer.
-          aBufLength -= (policyLen + 1); 
-        }
-      }
-      policyInfos++;
-      PR_smprintf_free(policyID);
-    }
-    
-    PORT_Free(policyItem.data);            
-    CERT_DestroyCertificatePoliciesExtension(policies);
-  }
-  
-  CERT_DestroyCertList(certs);
-  PK11_FreeSlot(slot);
-  return S_OK;
-  }
-*/
 bool 
 NSSManager::RequiresAuthentication(const CoolKey *aKey)
 {
-
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::RequiresAuthentication \n"));
-  if (!aKey || !aKey->mKeyID)
-    return false;
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::RequiresAuthentication \n",GetTStamp(tBuff,56)));
+    if (!aKey || !aKey->mKeyID)
+        return false;
   
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
   
-  if (!slot)
-    return false;
+    if (!slot)
+        return false;
   
-  bool needsLogin = false;
+    bool needsLogin = false;
   
-  if (PK11_IsPresent(slot))
-    needsLogin = PK11_NeedLogin(slot) ? true : false;
+    if (PK11_IsPresent(slot))
+        needsLogin = PK11_NeedLogin(slot) ? true : false;
   
-  PK11_FreeSlot(slot);
+    PK11_FreeSlot(slot);
   
-  return needsLogin;
+    return needsLogin;
 }
 
 bool 
 NSSManager::IsAuthenticated(const CoolKey *aKey)
 {
-
-  PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("NSSManager::IsAuthenticated \n"));
-  if (!aKey || !aKey->mKeyID)
-    return false;
+    char tBuff[56];
+    PR_LOG( coolKeyLogNSS, PR_LOG_DEBUG, ("%s NSSManager::IsAuthenticated \n",GetTStamp(tBuff,56)));
+    if (!aKey || !aKey->mKeyID)
+        return false;
   
-  PK11SlotInfo *slot = GetSlotForKeyID(aKey);
+    PK11SlotInfo *slot = GetSlotForKeyID(aKey);
   
-  if (!slot)
-    return false;
+    if (!slot)
+        return false;
   
-  bool isAuthenticated = false;
+    bool isAuthenticated = false;
   
-  if (PK11_IsPresent(slot))
-    isAuthenticated = PK11_IsLoggedIn(slot, NULL) ? true : false;
+    if (PK11_IsPresent(slot))
+        isAuthenticated = PK11_IsLoggedIn(slot, NULL) ? true : false;
   
-  PK11_FreeSlot(slot);
+    PK11_FreeSlot(slot);
   
-  return isAuthenticated;
+    return isAuthenticated;
 }



From fedora-directory-commits at redhat.com  Sat Feb 24 02:21:17 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:21:17 -0500
Subject: [Fedora-directory-commits] esc/src/lib/coolkey SlotUtils.cpp, 1.2,
	1.3
Message-ID: <200702240221.l1O2LH04002378@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2362

Modified Files:
	SlotUtils.cpp 
Log Message:
Add time stamps to log messages and formatting.



Index: SlotUtils.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/SlotUtils.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SlotUtils.cpp	27 Sep 2006 17:47:46 -0000	1.2
+++ SlotUtils.cpp	24 Feb 2007 02:21:15 -0000	1.3
@@ -32,6 +32,7 @@
 #include "prprf.h"
 #include "prlock.h"
 #include <assert.h>
+#include <time.h>
 
 #include "SlotUtils.h"
 #include <list>
@@ -52,48 +53,48 @@
 class AutoCoolKeyListLock
 {
 public:
-  AutoCoolKeyListLock() { LockCoolKeyList(); }
-  ~AutoCoolKeyListLock() { UnlockCoolKeyList(); }
+    AutoCoolKeyListLock() { LockCoolKeyList(); }
+    ~AutoCoolKeyListLock() { UnlockCoolKeyList(); }
 };
 
 void
 InitCoolKeyList()
 {
-
-  gCoolKeyListLock = PR_NewLock();
+    gCoolKeyListLock = PR_NewLock();
 }
 
 void
 DestroyCoolKeyList()
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("DestroyCoolKeyList:\n"));
-  ClearCoolKeyList();
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s DestroyCoolKeyList:\n",GetTStamp(tBuff,56)));
+    ClearCoolKeyList();
 
-  if (gCoolKeyListLock)
-  {
-    PR_DestroyLock(gCoolKeyListLock);
-    gCoolKeyListLock = NULL;
-  }
+    if (gCoolKeyListLock)
+    {
+        PR_DestroyLock(gCoolKeyListLock);
+        gCoolKeyListLock = NULL;
+    }
 }
 
 void
 LockCoolKeyList()
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("LockCoolKeyList:\n gCoolKeyListLock %p",gCoolKeyListLock));
-
-  if(!gCoolKeyListLock)
-  {
-      gCoolKeyListLock = PR_NewLock();
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s LockCoolKeyList:\n gCoolKeyListLock %p",GetTStamp(tBuff,56),gCoolKeyListLock));
 
-  }
+    if(!gCoolKeyListLock)
+    {
+        gCoolKeyListLock = PR_NewLock();
+    }
 
-  if (gCoolKeyListLock) {
+    if (gCoolKeyListLock) {
 
-    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("LockCoolKeyList:\n gCoolKeyListLock %p about to lock gCoolKeyListLock",gCoolKeyListLock));
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s LockCoolKeyList:\n gCoolKeyListLock %p about to lock gCoolKeyListLock",GetTStamp(tBuff,56),gCoolKeyListLock));
 
     PR_Lock(gCoolKeyListLock);
 
-    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("LockCoolKeyList:\n gCoolKeyListLock %p obtained gCoolKeyListLock",gCoolKeyListLock));
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s LockCoolKeyList:\n gCoolKeyListLock %p obtained gCoolKeyListLock",GetTStamp(tBuff,56),gCoolKeyListLock));
 
 #ifdef DEBUG
     assert(gCoolKeyListLockCount == 0);
@@ -105,385 +106,409 @@
 void
 UnlockCoolKeyList()
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("UnLockCoolKeyList:\n"));
-  if (gCoolKeyListLock) {
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s UnLockCoolKeyList:\n",GetTStamp(tBuff,56)));
+    if (gCoolKeyListLock) {
 #ifdef DEBUG
-    --gCoolKeyListLockCount;
-    assert(gCoolKeyListLockCount == 0);
+        --gCoolKeyListLockCount;
+        assert(gCoolKeyListLockCount == 0);
 #endif // DEBUG
-    PR_Unlock(gCoolKeyListLock);
-  }
+        PR_Unlock(gCoolKeyListLock);
+    }
 }
 
 CoolKeyInfo *
 GetCoolKeyInfoByReaderName(const char *aReaderName)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetCoolKeyInfoByReaderName:\n"));
-  AutoCoolKeyListLock autoLock;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetCoolKeyInfoByReaderName:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  std::list<CoolKeyInfo*>::iterator it;
+    std::list<CoolKeyInfo*>::iterator it;
 
-  for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
-  {
-    if (!PL_strcasecmp((*it)->mReaderName, aReaderName))
-      return *it;
-  }
+    for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
+    {
+        if (!PL_strcasecmp((*it)->mReaderName, aReaderName))
+            return *it;
+    }
 
-  return NULL;
+    return NULL;
 }
 
 CoolKeyInfo *
 GetCoolKeyInfoBySlotName(const char *aSlotName)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetCoolKeyInfoBySlotName:\n"));
-  AutoCoolKeyListLock autoLock;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetCoolKeyInfoBySlotName:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  std::list<CoolKeyInfo*>::iterator it;
+    std::list<CoolKeyInfo*>::iterator it;
 
-  for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
-  {
-      const char* slotName = PK11_GetSlotName((*it)->mSlot);
-
-      if (!PL_strcasecmp(slotName, aSlotName))
-      {
-        return (*it);
-      }
-  }
+    for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
+    {
+        const char* slotName = PK11_GetSlotName((*it)->mSlot);
 
-  return NULL;
+        if (!PL_strcasecmp(slotName, aSlotName))
+        {
+          return (*it);
+        }
+    }
+
+    return NULL;
 }
 
 CoolKeyInfo *
 GetCoolKeyInfoBySlot(PK11SlotInfo *aSlot)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetCoolKeyInfoBySlot:\n"));
-  AutoCoolKeyListLock autoLock;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetCoolKeyInfoBySlot:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  std::list<CoolKeyInfo*>::iterator it;
+    std::list<CoolKeyInfo*>::iterator it;
 
-  for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
-  {
-      if ((*it)->mSlot == aSlot)
-      {
-        return (*it);
-      }
-  }
+    for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
+    {
+        if ((*it)->mSlot == aSlot)
+        {
+          return (*it);
+        }
+    }
 
-  return NULL;
+    return NULL;
 }
 
 CoolKeyInfo *
 GetCoolKeyInfoByKeyIDInternal(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetCoolKeyInfoByKeyIDInternal:\n"));
-  std::list<CoolKeyInfo*>::iterator it;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetCoolKeyInfoByKeyIDInternal:\n",GetTStamp(tBuff,56)));
+    std::list<CoolKeyInfo*>::iterator it;
+
+    if(!aKey)
+        return NULL;
 
-  for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
-  {
-    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetCoolKeyInfoByKeyIDInternal id %s:\n",(*it)->mCUID));
+    for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
+    {
+
+        PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetCoolKeyInfoByKeyIDInternal id %s:\n",GetTStamp(tBuff,56),(*it)->mCUID));
     // XXX_KEY_TYPE_CASUALTY: We need to check the keyType here too!
-    if (!PL_strcasecmp((*it)->mCUID, aKey->mKeyID))
-      return *it;
-  }
+        if (!PL_strcasecmp((*it)->mCUID, aKey->mKeyID))
+            return *it;
+    }
 
-  return NULL;
+    return NULL;
 }
 
 CoolKeyInfo *
 GetCoolKeyInfoByKeyID(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetCoolKeyInfoByKeyID:\n"));
-  AutoCoolKeyListLock autoLock;
-  return GetCoolKeyInfoByKeyIDInternal(aKey);
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetCoolKeyInfoByKeyID:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
+    return GetCoolKeyInfoByKeyIDInternal(aKey);
 }
 
-
 CoolKeyInfo *
 GetCoolKeyInfoByTokenName(const char *aTokenName)
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetCoolKeyInfoByTokenName:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetCoolKeyInfoByTokenName:\n"));
-  AutoCoolKeyListLock autoLock;
+    std::list<CoolKeyInfo*>::iterator it;
 
-  std::list<CoolKeyInfo*>::iterator it;
+    for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
+    {
+        char* tokenName = PK11_GetTokenName((*it)->mSlot);
 
-  for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
-  {
-      char* tokenName = PK11_GetTokenName((*it)->mSlot);
-
-      if (!PL_strcasecmp(tokenName, aTokenName))
-      {
-        return (*it);
-      }
-  }
+        if (!PL_strcasecmp(tokenName, aTokenName))
+        {
+          return (*it);
+        }
+    }
 
-  return NULL;
+    return NULL;
 }
 
 const char *
 GetReaderNameForKeyID(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetReaderNameForKeyID:\n"));
-  AutoCoolKeyListLock autoLock;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetReaderNameForKeyID:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
+    const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
 
-  if (!info)
-    return 0;
+    if (!info)
+        return 0;
 
-  return info->mReaderName;
+    return info->mReaderName;
 }
 
 const char *
 GetSlotNameForKeyID(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetSlotNameForKeyID:\n"));
-  const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
-  if (!info)
-    return NULL;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetSlotNameForKeyID:\n",GetTStamp(tBuff,56)));
+    const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
+    if (!info)
+        return NULL;
 
-  return PK11_GetSlotName(info->mSlot);
+    return PK11_GetSlotName(info->mSlot);
 }
 
 const char *
 GetATRForKeyID(const CoolKey *aKey)
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetSlotNameForKeyID:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetSlotNameForKeyID:\n"));
-  AutoCoolKeyListLock autoLock;
-
-  const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
+    const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
 
-  if (!info)
-    return 0;
+    if (!info)
+        return 0;
 
-  return info->mATR;
+    return info->mATR;
 }
 
 const char *
 GetCUIDForKeyID(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetCUIDForKeyID:\n"));
-  AutoCoolKeyListLock autoLock;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetCUIDForKeyID:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
+    const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
 
-  if (!info)
-    return 0;
+    if (!info)
+        return 0;
 
-  return info->mCUID;
+    return info->mCUID;
 }
 
 const char *
 GetMSNForKeyIDInternal(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetMSNForKeyIDInternal:\n"));
-  const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetMSNForKeyIDInternal:\n",GetTStamp(tBuff,56)));
+    const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
 
-  if (!info)
-    return 0;
+    if (!info)
+        return 0;
 
-  return info->mMSN;
+    return info->mMSN;
 }
 
 const char *
 GetMSNForKeyID(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetMSNForKeyID:\n"));
-  AutoCoolKeyListLock autoLock;
-  return GetMSNForKeyIDInternal(aKey);
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetMSNForKeyID:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
+    return GetMSNForKeyIDInternal(aKey);
 }
 
 
 unsigned int
 GetInfoFlagsForKeyID(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetInfoFlagsForKeyID:\n"));
-  AutoCoolKeyListLock autoLock;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetInfoFlagsForKeyID:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
+    const CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
 
-  if (!info)
-    return 0;
+    if (!info)
+        return 0;
 
-  return info->mInfoFlags;
+    return info->mInfoFlags;
 }
 
 int
 RefreshInfoFlagsForKeyID(const CoolKey *aKey)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("RefreshInfoFlagsForKeyID:\n"));
-  AutoCoolKeyListLock autoLock;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s RefreshInfoFlagsForKeyID:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
+    CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
 
-  int alreadyCoolKey = 0;
-  if( IS_REALLY_A_COOLKEY(info->mInfoFlags))
-     alreadyCoolKey = 1;
+    if(!info)
+        return -1;
+    int alreadyCoolKey = 0;
+    if( IS_REALLY_A_COOLKEY(info->mInfoFlags))
+        alreadyCoolKey = 1;
 
-  if (!info)
-    return -1;
+    if (!info)
+        return -1;
 
-  if (!HAS_ATR(info->mInfoFlags))
-    return -1;
+    if (!HAS_ATR(info->mInfoFlags))
+        return -1;
 
-  info->mInfoFlags = CKHGetInfoFlags(info->mSlot);
+    info->mInfoFlags = CKHGetInfoFlags(info->mSlot);
 
-  if(alreadyCoolKey)
-  {
-      info->mInfoFlags |= COOLKEY_INFO_IS_REALLY_A_COOLKEY_MASK;
-  }
+    if(alreadyCoolKey)
+    {
+        info->mInfoFlags |= COOLKEY_INFO_IS_REALLY_A_COOLKEY_MASK;
+    }
 
-  return 0;
+    return 0;
 }
 
 int
 InsertCoolKeyInfoIntoCoolKeyList(CoolKeyInfo *aInfo)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("InsertCoolKeyInfoIntoCoolKeyList:\n"));
-  AutoCoolKeyListLock autoLock;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s InsertCoolKeyInfoIntoCoolKeyList:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  if (!aInfo)
-    return -1;
+    if (!aInfo)
+        return -1;
 
-  gCoolKeyList.push_back(aInfo);
+    gCoolKeyList.push_back(aInfo);
 
-  return 0;
+    return 0;
 }
 
 int
 RemoveCoolKeyInfoFromCoolKeyList(CoolKeyInfo *aInfo)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("RemoveCoolKeyInfoFromCoolKeyList:\n"));
-  AutoCoolKeyListLock autoLock;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s RemoveCoolKeyInfoFromCoolKeyList:\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
+
+    if (!aInfo)
+        return -1;
 
-  if (!aInfo)
-    return -1;
+    std::list<CoolKeyInfo*>::iterator it;
 
-  std::list<CoolKeyInfo*>::iterator it;
 
-  for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
-  {
-    if (*it == aInfo)
+    for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
     {
-      gCoolKeyList.erase(it);
-      break;
+        if (*it == aInfo)
+        {
+            gCoolKeyList.erase(it);
+            break;
+        }
     }
-  }
 
-  return 0;
+    return 0;
 }
 
 int
 ClearCoolKeyList()
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s ClearCoolKeyList:entering\n",GetTStamp(tBuff,56)));
+    AutoCoolKeyListLock autoLock;
 
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("ClearCoolKeyList:entering\n"));
-  AutoCoolKeyListLock autoLock;
-
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("ClearCoolKeyList:\n"));
-  std::list<CoolKeyInfo*>::iterator it;
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s ClearCoolKeyList:\n",GetTStamp(tBuff,56)));
+    std::list<CoolKeyInfo*>::iterator it;
 
-  for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
-  {
-    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("ClearCoolKeyList: clearing %p \n",*it));
-    CoolKeyInfo *info = *it;
-    delete info;
-  }
+    for (it = gCoolKeyList.begin(); it != gCoolKeyList.end(); ++it)
+    {
+        PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s ClearCoolKeyList: clearing %p \n",GetTStamp(tBuff,56),*it));
+        CoolKeyInfo *info = *it;
+        delete info;
+    }
 
-  gCoolKeyList.clear();
+    gCoolKeyList.clear();
 
-  return 0;
+    return 0;
 }
 
 PK11SlotInfo *GetSlotForKeyID(const CoolKey *aKey)
 {
-  AutoCoolKeyListLock autoLock;
-
+    AutoCoolKeyListLock autoLock;
 
-   PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetSlotForKeyID:\n"));  
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetSlotForKeyID:\n",GetTStamp(tBuff,56)));  
 
-  if (!aKey)
-  {
-    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetSlotForKeyID: null CoolKey.\n"));
-    return NULL;
-  }
+    if (!aKey)
+    {
+        PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetSlotForKeyID: null CoolKey.\n",GetTStamp(tBuff,56)));
+        return NULL;
+    }
 
-  CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
-  if (!info)
-    return NULL;
+    CoolKeyInfo *info = GetCoolKeyInfoByKeyIDInternal(aKey);
+    if (!info)
+        return NULL;
 
-  return PK11_ReferenceSlot(info->mSlot);
+    return PK11_ReferenceSlot(info->mSlot);
 }
 
 enum {
-  eGetPublicKey,
-  eGetPrivateKey
+    eGetPublicKey,
+    eGetPrivateKey
 };
 
 void* GetAuthKey(int keyType, PK11SlotInfo* slot)
 {
-  PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetAuthKey:\n"));
-  CERTCertListNode *node;
-  CERTCertList *certs = PK11_ListCertsInSlot(slot);
-  if (!certs)
-    return NULL;
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetAuthKey:\n",GetTStamp(tBuff,56)));
+    CERTCertListNode *node;
+    CERTCertList *certs = PK11_ListCertsInSlot(slot);
+    if (!certs)
+        return NULL;
 
-  for (node = CERT_LIST_HEAD(certs); !CERT_LIST_END(node,certs); node = CERT_LIST_NEXT(node))
-  {
-    SECItem policyItem;
-    policyItem.data = 0;
-    
-    SECStatus s = CERT_FindCertExtension(node->cert, SEC_OID_X509_CERTIFICATE_POLICIES, &policyItem);
-    
-    if (s != SECSuccess || !policyItem.data) 
-      continue;
-    
-    CERTCertificatePolicies *policies = CERT_DecodeCertificatePoliciesExtension(&policyItem);
-    
-    if (!policies)
+    for (node = CERT_LIST_HEAD(certs); !CERT_LIST_END(node,certs); node = CERT_LIST_NEXT(node))
     {
-      PORT_Free(policyItem.data);
-      continue;
-    }
+        SECItem policyItem;
+        policyItem.data = 0;
     
-    CERTPolicyInfo **policyInfos = policies->policyInfos;
+        SECStatus s = CERT_FindCertExtension(node->cert, SEC_OID_X509_CERTIFICATE_POLICIES, &policyItem);
     
-    while (*policyInfos)
-    {
-      char *policyID = CERT_GetOidString(&(*policyInfos)->policyID);
-      if (!PL_strcasecmp(policyID, SAOL_OID_BRONZE))
-      {
-        PR_smprintf_free(policyID);
-        PORT_Free(policyItem.data);
-
-        if (keyType == eGetPrivateKey)
-          return PK11_FindPrivateKeyFromCert(slot, node->cert, NULL);
+        if (s != SECSuccess || !policyItem.data) 
+            continue;
+    
+        CERTCertificatePolicies *policies = CERT_DecodeCertificatePoliciesExtension(&policyItem);
+    
+        if (!policies)
+        {
+            PORT_Free(policyItem.data);
+            continue;
+        }
+    
+        CERTPolicyInfo **policyInfos = policies->policyInfos;
+    
+        while (*policyInfos)
+        {
+            char *policyID = CERT_GetOidString(&(*policyInfos)->policyID);
+            if (!PL_strcasecmp(policyID, SAOL_OID_BRONZE))
+            {
+                PR_smprintf_free(policyID);
+                PORT_Free(policyItem.data);
+
+                if (keyType == eGetPrivateKey)
+                     return PK11_FindPrivateKeyFromCert(slot, node->cert, NULL);
+
+                if (keyType == eGetPublicKey)
+                    return SECITEM_DupItem(&node->cert->derPublicKey);
+            }
+            policyInfos++;
+            PR_smprintf_free(policyID);
+        }
 
-        if (keyType == eGetPublicKey)
-          return SECITEM_DupItem(&node->cert->derPublicKey);
-      }
-      policyInfos++;
-      PR_smprintf_free(policyID);
+        PORT_Free(policyItem.data);
+        CERT_DestroyCertificatePoliciesExtension(policies);
     }
 
-    PORT_Free(policyItem.data);
-    CERT_DestroyCertificatePoliciesExtension(policies);
-  }
-
-  CERT_DestroyCertList(certs);
-  return NULL;
+    CERT_DestroyCertList(certs);
+    return NULL;
 }
 
 SECKEYPrivateKey* GetAuthenticationPrivateKey(PK11SlotInfo* slot)
 {
-    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetAuthenticationPrivateKey:\n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetAuthenticationPrivateKey:\n",GetTStamp(tBuff,56)));
     return (SECKEYPrivateKey*) GetAuthKey(eGetPrivateKey, slot);
 }
 
 SECItem* GetAuthenticationPublicKey(PK11SlotInfo* slot)
 {
-    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("GetAuthenticationPrivateKey:\n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLogSU, PR_LOG_DEBUG, ("%s GetAuthenticationPrivateKey:\n",GetTStamp(tBuff,56)));
     return (SECItem*) GetAuthKey(eGetPublicKey, slot);
 }
 
@@ -491,47 +516,47 @@
 #ifdef DUMP_CHALLENGE_RESPONSE
 void DumpAuthenticationPublicKey(PK11SlotInfo* slot, FILE *f)
 {
-  CERTCertListNode *node;
-  CERTCertList *certs = PK11_ListCertsInSlot(slot);
-  if (!certs)
-    return;
+    CERTCertListNode *node;
+    CERTCertList *certs = PK11_ListCertsInSlot(slot);
+    if (!certs)
+        return;
 
-  for (node = CERT_LIST_HEAD(certs); !CERT_LIST_END(node,certs); node = CERT_LIST_NEXT(node))
-  {
-    SECItem policyItem;
-    policyItem.data = 0;
-    
-    SECStatus s = CERT_FindCertExtension(node->cert, SEC_OID_X509_CERTIFICATE_POLICIES, &policyItem);
-    
-    if (s != SECSuccess || !policyItem.data) 
-      continue;
-    
-    CERTCertificatePolicies *policies = CERT_DecodeCertificatePoliciesExtension(&policyItem);
-    
-    if (!policies)
+    for (node = CERT_LIST_HEAD(certs); !CERT_LIST_END(node,certs); node = CERT_LIST_NEXT(node))
     {
-      PORT_Free(policyItem.data);
-      continue;
-    }
+        SECItem policyItem;
+        policyItem.data = 0;
     
-    CERTPolicyInfo **policyInfos = policies->policyInfos;
+        SECStatus s = CERT_FindCertExtension(node->cert, SEC_OID_X509_CERTIFICATE_POLICIES, &policyItem);
     
-    while (*policyInfos)
-    {
-      char *policyID = CERT_GetOidString(&(*policyInfos)->policyID);
-      if (!PL_strcasecmp(policyID, SAOL_OID_BRONZE))
-      {
-        PR_smprintf_free(policyID);
-        PORT_Free(policyItem.data);  
-        fwrite(node->cert->derCert.data, node->cert->derCert.len, 1, f);
-        return; 
-      }
-      policyInfos++;
-      PR_smprintf_free(policyID);
-    }
+        if (s != SECSuccess || !policyItem.data) 
+            continue;
+    
+        CERTCertificatePolicies *policies = CERT_DecodeCertificatePoliciesExtension(&policyItem);
+    
+        if (!policies)
+        {
+            PORT_Free(policyItem.data);
+            continue;
+        }
+    
+        CERTPolicyInfo **policyInfos = policies->policyInfos;
+    
+        while (*policyInfos)
+        {
+            char *policyID = CERT_GetOidString(&(*policyInfos)->policyID);
+            if (!PL_strcasecmp(policyID, SAOL_OID_BRONZE))
+            {
+                PR_smprintf_free(policyID);
+                PORT_Free(policyItem.data);  
+                fwrite(node->cert->derCert.data, node->cert->derCert.len, 1, f);
+                return; 
+            }
+            policyInfos++;
+            PR_smprintf_free(policyID);
+        }
 
-    PORT_Free(policyItem.data);
-    CERT_DestroyCertificatePoliciesExtension(policies);
+        PORT_Free(policyItem.data);
+        CERT_DestroyCertificatePoliciesExtension(policies);
   }
 
   CERT_DestroyCertList(certs);



From fedora-directory-commits at redhat.com  Sat Feb 24 02:22:06 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Fri, 23 Feb 2007 21:22:06 -0500
Subject: [Fedora-directory-commits] esc/src/lib/coolkey
	SmartCardMonitoringThread.cpp, 1.2, 1.3
Message-ID: <200702240222.l1O2M61n002461@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2391

Modified Files:
	SmartCardMonitoringThread.cpp 
Log Message:
Add time stamps to log messages.



Index: SmartCardMonitoringThread.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/SmartCardMonitoringThread.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SmartCardMonitoringThread.cpp	27 Sep 2006 17:47:46 -0000	1.2
+++ SmartCardMonitoringThread.cpp	24 Feb 2007 02:22:04 -0000	1.3
@@ -28,213 +28,215 @@
 #include "SlotUtils.h"
 
 #include <assert.h>
+#include <time.h>
 
 static PRLogModuleInfo *coolKeyLogSC = PR_NewLogModule("coolKeySmart");
 
 SmartCardMonitoringThread::SmartCardMonitoringThread(SECMODModule *aModule)
   : mModule(aModule), mThread(NULL)
 {
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-            ("SmartCardMonitoringThread::SmartCardMonitoringThread : \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+            ("%s SmartCardMonitoringThread::SmartCardMonitoringThread : \n",GetTStamp(tBuff,56)));
 }
 
 SmartCardMonitoringThread::~SmartCardMonitoringThread()
 {
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-          ("SmartCardMonitoringThread::~SmartCardMonitoringThread : \n"));
-  Stop();
+    char tBuff[56];
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+          ("%s SmartCardMonitoringThread::~SmartCardMonitoringThread : \n",GetTStamp(tBuff,56)));
+    Stop();
 }
 
 void SmartCardMonitoringThread::Start()
 {
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-          ("SmartCardMonitoringThread::Start : \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+          ("%s SmartCardMonitoringThread::Start : \n",GetTStamp(tBuff,56)));
 
-  if (!mThread) {
-    mThread = PR_CreateThread(PR_SYSTEM_THREAD, LaunchExecute, this,
+    if (!mThread) {
+        mThread = PR_CreateThread(PR_SYSTEM_THREAD, LaunchExecute, this,
                               PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
                               PR_JOINABLE_THREAD, 0);
-  }
+    }
 }
 
 void SmartCardMonitoringThread::Stop()
 {
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-          ("SmartCardMonitoringThread::Stop : \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+          ("%s SmartCardMonitoringThread::Stop : \n",GetTStamp(tBuff,56)));
 
-  Interrupt();
+    Interrupt();
 }
 
 void SmartCardMonitoringThread::Insert(PK11SlotInfo *aSlot)
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+          ("%s SmartCardMonitoringThread::Insert  Key. \n",GetTStamp(tBuff,56)));
 
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-          ("SmartCardMonitoringThread::Insert  Key. \n"));
-
-  CoolKeyInfo *info = CKHGetCoolKeyInfo(aSlot);
-  if (info) {
-    if (!InsertCoolKeyInfoIntoCoolKeyList(info)) {
-      AutoCoolKey key(eCKType_CoolKey, info->mCUID);
-      CoolKeyNotify(&key, eCKState_KeyInserted, 0);
-    } else {
-      delete info;
-    }
-  } 
+    CoolKeyInfo *info = CKHGetCoolKeyInfo(aSlot);
+    if (info) {
+        if (!InsertCoolKeyInfoIntoCoolKeyList(info)) {
+            AutoCoolKey key(eCKType_CoolKey, info->mCUID);
+            CoolKeyNotify(&key, eCKState_KeyInserted, 0);
+        } else {
+            delete info;
+        }
+    } 
 }
 
 void SmartCardMonitoringThread::Remove(CoolKeyInfo *info)
 {
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-          ("SmartCardMonitoringThread::Remove Key: \n"));
+    char tBuff[56];
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+          ("%s SmartCardMonitoringThread::Remove Key: \n",GetTStamp(tBuff,56)));
 
-  info->mInfoFlags = 0;
-  AutoCoolKey key(eCKType_CoolKey, info->mCUID);
-  CoolKeyNotify(&key, eCKState_KeyRemoved, 0);
-  RemoveCoolKeyInfoFromCoolKeyList(info);
+    info->mInfoFlags = 0;
+    AutoCoolKey key(eCKType_CoolKey, info->mCUID);
+    CoolKeyNotify(&key, eCKState_KeyRemoved, 0);
+    RemoveCoolKeyInfoFromCoolKeyList(info);
 }
 
 void SmartCardMonitoringThread::Execute()
 {
-  PK11SlotInfo *slot;
+    char tBuff[56];
+    PK11SlotInfo *slot;
 
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-         ("SmartCardMonitoringThread::Execute.\n"));
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+         ("%s SmartCardMonitoringThread::Execute.\n",GetTStamp(tBuff,56)));
   //
   // populate token names for already inserted tokens.
   //
-  PK11SlotList *sl =
+    PK11SlotList *sl =
 	PK11_FindSlotsByNames(mModule->dllName, NULL, NULL, PR_TRUE);
-  PK11SlotListElement *sle;
+    PK11SlotListElement *sle;
  
-  if (sl) {
+    if (sl) {
 
-    for (sle=PK11_GetFirstSafe(sl); sle; 
+        for (sle=PK11_GetFirstSafe(sl); sle; 
 				      sle=PK11_GetNextSafe(sl,sle,PR_FALSE)) {
-
-      Insert(sle->slot);
-
-      PK11_FreeSlot(sle->slot);
+            Insert(sle->slot);
+            PK11_FreeSlot(sle->slot);
+        }
+        PK11_FreeSlotList(sl);
     }
-    PK11_FreeSlotList(sl);
-  }
 
   // loop starts..
-  do {
-
-     PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-            ("SmartCardMonitoringThread::Execute.Waiting for TokenEvent\n"));
-    slot = SECMOD_WaitForAnyTokenEvent(mModule, 0, PR_SecondsToInterval(1)  );
-
-
-    PR_LOG( coolKeyLogSC, PR_LOG_ALWAYS, 
-           ("SmartCard thread event detected. \n"));
-
-    if (slot == NULL) {
+    do {
 
-       PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-              ("SmartCardMonitoringThread::Execute. slot is NULL\n"));
-      break;
-    }
+        PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+            ("%s SmartCardMonitoringThread::Execute.Waiting for TokenEvent\n",GetTStamp(tBuff,56)));
+        slot = SECMOD_WaitForAnyTokenEvent(mModule, 0, PR_SecondsToInterval(1)  );
+        PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+           ("%s SmartCard thread event detected. \n",GetTStamp(tBuff,56)));
+
+        if (slot == NULL) {
+
+            PR_LOG( coolKeyLogSC, PR_LOG_ERROR, 
+              ("%s SmartCard thread event detected, but the slot is NULL.\n",GetTStamp(tBuff,56)));
+            break;
+        }
 
     // now we have a potential insertion or removal event see if the slot
     // is present to determine which it is...
-    CoolKeyInfo *info = GetCoolKeyInfoBySlot(slot);
-
-    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
-             ("SmartCardMonitoringThread::info %p : \n",info));
+        CoolKeyInfo *info = GetCoolKeyInfoBySlot(slot);
 
-    PRBool isPresent = PK11_IsPresent(slot);
+        PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
+             ("%s SmartCardMonitoringThread::info %p : \n",GetTStamp(tBuff,56),info));
 
+        PRBool isPresent = PK11_IsPresent(slot);
 
-    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
-             ("SmartCardMonitoringThread::isPresent %d : \n",isPresent));
-
+        PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
+             ("%s SmartCardMonitoringThread::isPresent %d : \n",GetTStamp(tBuff,56),isPresent));
 
     /* if we think we have a token, but it's not the right one, or it's 
      * not there, then send a removal event */
-    if (info && (!isPresent || (info->mSeries != PK11_GetSlotSeries(slot))) ) {
+        if (info && (!isPresent || (info->mSeries != PK11_GetSlotSeries(slot))) ) {
 
-      PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-             ("SmartCardMonitoringThread::Execute Token Removed : \n"));
+            PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+             ("%s SmartCardMonitoringThread::Execute Token Removed : \n",GetTStamp(tBuff,56)));
 
-      Remove(info);
-      delete info;
-      info = NULL;
-    }
+            Remove(info);
+            delete info;
+            info = NULL;
+        }
     /* if the there is a token and we don't have info for it, send an 
      * insertion event */
-    if (isPresent && !info) {
+        if (isPresent && !info) {
 
-      PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-             ("SmartCardMonitoringThread::Execute Token Inserted : \n"));
+            PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+             ("%s SmartCardMonitoringThread::Execute Token Inserted : \n",GetTStamp(tBuff,56)));
 
-      Insert(slot);
-    }
-    PK11_FreeSlot(slot);
+           Insert(slot);
+        }
+        PK11_FreeSlot(slot);
 
-  } while (1);
+    } while (1);
 
 }
 
 void SmartCardMonitoringThread::Interrupt()
 {
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-         ("SmartCardMonitoringThread::Interrupt: mThread %p mModule %p\n",mThread,mModule));
+    char tBuff[56];
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+         ("%s SmartCardMonitoringThread::Interrupt: mThread %p mModule %p\n",GetTStamp(tBuff,56),mThread,mModule));
 
-  if(mThread)
-  {
-    SECStatus rv;
-    rv = SECMOD_CancelWait(mModule);
-    if (rv !=SECSuccess) {
-      PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-              ("SmartCardMonitoringThread::Interrupt:"
+    if(mThread)
+    {
+        SECStatus rv;
+        rv = SECMOD_CancelWait(mModule);
+        if (rv !=SECSuccess) {
+            PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+              ("%s SmartCardMonitoringThread::Interrupt:"
                " Can't join thread. result of CancelWait"
-               " %d error %d \n",rv,PORT_GetError()));
+               " %d error %d \n",GetTStamp(tBuff,56),rv,PORT_GetError()));
 
-      return; // don't hang if we couldn't wake up thread!!
-    }
-    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-           ("SmartCardMonitoringThread::Interrupt: "
-            "About to join smart card thread. \n"));
+           return; // don't hang if we couldn't wake up thread!!
+        }
+        PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+           ("%s SmartCardMonitoringThread::Interrupt: "
+            "About to join smart card thread. \n",GetTStamp(tBuff,56)));
 
-    PRStatus rs = PR_JoinThread(mThread);
+        PRStatus rs = PR_JoinThread(mThread);
 
-    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-           ("SmartCardMonitoringThread::Interrupt: result"
-            " of PR_JoinThread %d error %d \n",rs,PORT_GetError()));
+        PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+           ("%s SmartCardMonitoringThread::Interrupt: result"
+            " of PR_JoinThread %d error %d \n",GetTStamp(tBuff,56),rs,PORT_GetError()));
 
-    mThread = 0; 
-  }
+        mThread = 0; 
+    }
 
-  if(mModule)
-  {
-       PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
-           ("SmartCardMonitoringThread::Interrupt: about to unload  module"
+    if(mModule)
+    {
+         PR_LOG( coolKeyLogSC, PR_LOG_DEBUG,
+           ("%s SmartCardMonitoringThread::Interrupt: about to unload  module \n",GetTStamp(tBuff,56)
             ));
 
-       mModule = 0;
-  }
+         mModule = 0;
+    }
 }
 
 void SmartCardMonitoringThread::Release() {
+    char tBuff[56];
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+         ("%s SmartCardMonitoringThread::Release : \n",GetTStamp(tBuff,56)));
 
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-         ("SmartCardMonitoringThread::Release : \n"));
-
-  if (mCurrentActivation)
-    free(mCurrentActivation); 
+    if (mCurrentActivation)
+         free(mCurrentActivation); 
   
-  mCurrentActivation= NULL;
+    mCurrentActivation= NULL;
 }
 
 void SmartCardMonitoringThread::OnComplete() 
 {
+    char tBuff[56];
+    PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
+         ("%s SmartCardMonitoringThread::OnComplete : \n",GetTStamp(tBuff,56)));
 
-  PR_LOG( coolKeyLogSC, PR_LOG_DEBUG, 
-         ("SmartCardMonitoringThread::OnComplete : \n"));
-
-  AutoCoolKey key(eCKType_CoolKey, mCurrentActivation);
-  CoolKeyNotify(&key, eCKState_KeyInserted, 0);
+    AutoCoolKey key(eCKType_CoolKey, mCurrentActivation);
+    CoolKeyNotify(&key, eCKState_KeyInserted, 0);
 }
 
 void SmartCardMonitoringThread::OnDisconnect() {}
@@ -242,6 +244,5 @@
 
 void SmartCardMonitoringThread::LaunchExecute(void *arg)
 {
-  ((SmartCardMonitoringThread*)arg)->Execute();
+    ((SmartCardMonitoringThread*)arg)->Execute();
 }
-



From fedora-directory-commits at redhat.com  Mon Feb 26 18:39:35 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Mon, 26 Feb 2007 13:39:35 -0500
Subject: [Fedora-directory-commits] esc/dist - New directory
Message-ID: <200702261839.l1QIdZdn003035@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/dist
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3021/dist

Log Message:
Directory /cvs/dirsec/esc/dist added to the repository




From fedora-directory-commits at redhat.com  Mon Feb 26 18:40:23 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Mon, 26 Feb 2007 13:40:23 -0500
Subject: [Fedora-directory-commits] esc/dist/src - New directory
Message-ID: <200702261840.l1QIeNiP003057@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/dist/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3041/src

Log Message:
Directory /cvs/dirsec/esc/dist/src added to the repository




From fedora-directory-commits at redhat.com  Tue Feb 27 02:57:31 2007
From: fedora-directory-commits at redhat.com (Pete Rowley (prowley))
Date: Mon, 26 Feb 2007 21:57:31 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src
	create_instance.c, 1.47, 1.48
Message-ID: <200702270257.l1R2vV8j016331@cvs-int.fedora.redhat.com>

Author: prowley

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16258/ldap/admin/src

Modified Files:
	create_instance.c 
Log Message:
Add LDAPI


Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- create_instance.c	23 Feb 2007 18:40:27 -0000	1.47
+++ create_instance.c	27 Feb 2007 02:57:24 -0000	1.48
@@ -2686,6 +2686,20 @@
     fprintf(f, "nsslapd-return-exact-case: on\n");
     fprintf(f, "nsslapd-ssl-check-hostname: on\n");
     fprintf(f, "nsslapd-port: %s\n", cf->servport);
+#if defined(ENABLE_LDAPI)
+    fprintf(f, "nsslapd-ldapifilepath: %s/%s-%s.socket\n", cf->run_dir, PRODUCT_NAME, cf->servid);
+    fprintf(f, "nsslapd-ldapilisten: on\n");
+#if defined(ENABLE_AUTOBIND)
+    fprintf(f, "nsslapd-ldapiautobind: on\n");
+#endif /* ENABLE_AUTOBIND */
+    fprintf(f, "nsslapd-ldapimaprootdn: cn=Directory Manager\n");
+    fprintf(f, "nsslapd-ldapimaptoentries: off\n");
+    fprintf(f, "nsslapd-ldapiuidnumbertype: uidNumber\n");
+    fprintf(f, "nsslapd-ldapigidnumbertype: gidNumber\n");
+    fprintf(f, "nsslapd-ldapientrysearchbase: dc=example, dc=com\n");
+    fprintf(f, "nsslapd-ldapiautodnsuffix: cn=peercred,cn=external,cn=auth\n");
+#endif /* ENABLE_LDAPI */
+
 #if !defined( XP_WIN32 )
     if (cf->servuser && *(cf->servuser)) {
         fprintf(f, "nsslapd-localuser: %s\n", cf->servuser);



From fedora-directory-commits at redhat.com  Tue Feb 27 02:57:32 2007
From: fedora-directory-commits at redhat.com (Pete Rowley (prowley))
Date: Mon, 26 Feb 2007 21:57:32 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldif
	close.c, 1.5, 1.6
Message-ID: <200702270257.l1R2vWrV016357@cvs-int.fedora.redhat.com>

Author: prowley

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16258/ldap/servers/slapd/back-ldif

Modified Files:
	close.c 
Log Message:
Add LDAPI


Index: close.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/close.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- close.c	10 Nov 2006 23:45:41 -0000	1.5
+++ close.c	27 Feb 2007 02:57:30 -0000	1.6
@@ -92,10 +92,10 @@
 {
   LDIF   *db;
   
-  LDAPDebug( LDAP_DEBUG_TRACE, "ldbm backend syncing\n", 0, 0, 0 );
+  LDAPDebug( LDAP_DEBUG_TRACE, "ldif backend syncing\n", 0, 0, 0 );
   slapi_pblock_get( pb, SLAPI_PLUGIN_PRIVATE, &db );
   ldif_free_db(db);
-  LDAPDebug( LDAP_DEBUG_TRACE, "ldbm backend done syncing\n", 0, 0, 0 );
+  LDAPDebug( LDAP_DEBUG_TRACE, "ldif backend done syncing\n", 0, 0, 0 );
 }
 
 /*
@@ -108,8 +108,8 @@
 void
 ldif_back_flush( Slapi_PBlock *pb )
 {
-  LDAPDebug( LDAP_DEBUG_TRACE, "ldbm backend flushing\n", 0, 0, 0 );
-  LDAPDebug( LDAP_DEBUG_TRACE, "ldbm backend done flushing\n", 0, 0, 0 );
+  LDAPDebug( LDAP_DEBUG_TRACE, "ldif backend flushing\n", 0, 0, 0 );
+  LDAPDebug( LDAP_DEBUG_TRACE, "ldif backend done flushing\n", 0, 0, 0 );
   return;
 }
 



From fedora-directory-commits at redhat.com  Tue Feb 27 02:57:32 2007
From: fedora-directory-commits at redhat.com (Pete Rowley (prowley))
Date: Mon, 26 Feb 2007 21:57:32 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd
	getsocketpeer.c, NONE, 1.1 getsocketpeer.h, NONE, 1.1 bind.c,
	1.9, 1.10 configdse.c, 1.6, 1.7 connection.c, 1.13,
	1.14 daemon.c, 1.11, 1.12 fe.h, 1.5, 1.6 libglobs.c, 1.14,
	1.15 main.c, 1.17, 1.18 passwd_extop.c, 1.14, 1.15 pblock.c,
	1.8, 1.9 proto-slap.h, 1.25, 1.26 pw_mgmt.c, 1.7,
	1.8 saslbind.c, 1.22, 1.23 slap.h, 1.20, 1.21 slapi-plugin.h,
	1.14, 1.15 start_tls_extop.c, 1.8, 1.9
Message-ID: <200702270257.l1R2vWgt016337@cvs-int.fedora.redhat.com>

Author: prowley

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16258/ldap/servers/slapd

Modified Files:
	bind.c configdse.c connection.c daemon.c fe.h libglobs.c 
	main.c passwd_extop.c pblock.c proto-slap.h pw_mgmt.c 
	saslbind.c slap.h slapi-plugin.h start_tls_extop.c 
Added Files:
	getsocketpeer.c getsocketpeer.h 
Log Message:
Add LDAPI


--- NEW FILE getsocketpeer.c ---
/** BEGIN COPYRIGHT BLOCK
 * 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; version 2 of the License.
 *
 * 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., 59 Temple
 * Place, Suite 330, Boston, MA 02111-1307 USA.
 *
 * In addition, as a special exception, Red Hat, Inc. gives You the additional
 * right to link the code of this Program with code not covered under the GNU
 * General Public License ("Non-GPL Code") and to distribute linked combinations * including the two, subject to the limitations in this paragraph. Non-GPL Code * permitted under this exception must only link to the code of this Program
 * through those well defined interfaces identified in the file named EXCEPTION
 * found in the source code files (the "Approved Interfaces"). The files of
 * Non-GPL Code may instantiate templates or use macros or inline functions from * the Approved Interfaces without causing the resulting work to be covered by
 * the GNU General Public License. Only Red Hat, Inc. may make changes or
 * additions to the list of Approved Interfaces. You must obey the GNU General
 * Public License in all respects for all of the Program code and other code used
 * in conjunction with the Program except the Non-GPL Code covered by this
 * exception. If you modify this file, you may extend this exception to your
 * version of the file, but you are not obligated to do so. If you do not wish to
 * provide this exception without modification, you must delete this exception
 * statement from your version and license this file solely under the GPL without
 * exception.
 *
 *
 * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
 * Copyright (C) 2007 Red Hat, Inc.
 * All rights reserved.
 * END COPYRIGHT BLOCK **/
#ifdef HAVE_CONFIG_H
#  include <config.h>
#endif

#if defined(ENABLE_LDAPI)

#if defined(HAVE_GETPEERUCRED)
#include <ucred.h>
#endif

#include <sys/types.h>
#include <unistd.h>
#include <sys/socket.h>

/* nspr secrets - we need to do an end run around nspr
   in order to do things it does not support
 */
#include <private/pprio.h>

int slapd_get_socket_peer(PRFileDesc *nspr_fd, uid_t *uid, gid_t *gid)
{
	int ret = -1;
	int fd = PR_FileDesc2NativeHandle(nspr_fd); /* naughty private func */

#if defined(SO_PEERCRED) /* linux */

	struct ucred creds;
	socklen_t len = sizeof(creds);

	if(0 == getsockopt(fd, SOL_SOCKET, SO_PEERCRED, (void*)&creds, &len ))
	{
		if(sizeof(creds) == len)
		{
			if(uid)
				*uid = creds.uid;
			if(gid)
				*gid = creds.gid;

			ret = 0;
		}
	}

#elif 0 /*defined(HAVE_GETPEERUCRED)*/ /* solaris */

	ucred_t *creds = 0;

	if(0 == getpeerucred(fd, &creds))
	{
		if(uid)
		{
			uid = ucred_getruid(creds);
			if(-1 != uid)
				ret = 0;
		}

		if(gid)
		{
			gid = ucred_getrgid(creds);
			if(-1 == gid)
				ret = -1;
			else
				ret = 0;
		}

		ucred_free(creds);
	}

#elif 0 /* defined(HAVE_GETPEEREID) */ /* osx / some BSDs */

	if(0 == getpeereid(fd, &uid, &gid))
		ret = 0;

#else 0 /* hpux / some BSDs - file descriptor cooperative auth */

        struct msghdr msg;
	struct iovec iov;
	char dummy[8];
	int fd[2];

	memset(msg, 0, sizeof(msg));
	
	iov.iov_base = dummy;
	iov.iov_len = sizeof(dummy);
	msg.msg_iov = &iov;
	msg.msg_iovlen = 1;
	msg.msg_accrights = (char*)fd;
	msg.msg_accrightslen = sizeof(fd);

        if(recvmsg(fd, &msg, MSG_PEEK) >= 0 && msg.msg_accrightslen == sizeof(int))
        {
		struct stat st;

		ret = fstat(fd[0], &st);
		close(fd[0]);

		if(0 == ret && S_ISFIFO(st.st_mode) &&
			0 == st.st_mode & (S_IRWXG|S_IRWXO))
		{
			if(uid)
				uid = st.st_uid;

			if(gid)
				gid = st.st_gid;
		}
        }

#endif

	return ret;
}

#endif /* ENABLE_LDAPI */


--- NEW FILE getsocketpeer.h ---
/** BEGIN COPYRIGHT BLOCK
 * 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; version 2 of the License.
 *
 * 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., 59 Temple
 * Place, Suite 330, Boston, MA 02111-1307 USA.
 *
 * In addition, as a special exception, Red Hat, Inc. gives You the additional
 * right to link the code of this Program with code not covered under the GNU
 * General Public License ("Non-GPL Code") and to distribute linked combinations * including the two, subject to the limitations in this paragraph. Non-GPL Code * permitted under this exception must only link to the code of this Program
 * through those well defined interfaces identified in the file named EXCEPTION
 * found in the source code files (the "Approved Interfaces"). The files of
 * Non-GPL Code may instantiate templates or use macros or inline functions from * the Approved Interfaces without causing the resulting work to be covered by
 * the GNU General Public License. Only Red Hat, Inc. may make changes or
 * additions to the list of Approved Interfaces. You must obey the GNU General
 * Public License in all respects for all of the Program code and other code used
 * in conjunction with the Program except the Non-GPL Code covered by this
 * exception. If you modify this file, you may extend this exception to your
 * version of the file, but you are not obligated to do so. If you do not wish to
 * provide this exception without modification, you must delete this exception
 * statement from your version and license this file solely under the GPL without
 * exception.
 *
 *
 * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
 * Copyright (C) 2007 Red Hat, Inc.
 * All rights reserved.
 * END COPYRIGHT BLOCK **/
#ifdef HAVE_CONFIG_H
#  include <config.h>
#endif
#if defined(ENABLE_LDAPI)
#if !defined(GETSOCKETPEER_H)
#define GETSOCKETPEER_H
int slapd_get_socket_peer(PRFileDesc *nspr_fd, uid_t *uid, gid_t *gid);
#endif
#endif /* ENABLE_LDAPI */


Index: bind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/bind.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bind.c	10 Nov 2006 23:45:40 -0000	1.9
+++ bind.c	27 Feb 2007 02:57:29 -0000	1.10
@@ -126,6 +126,7 @@
     char **supported, **pmech;
     char authtypebuf[256]; /* >26 (strlen(SLAPD_AUTH_SASL)+SASL_MECHNAMEMAX+1) */
     Slapi_Entry *bind_target_entry = NULL;
+    int auto_bind = 0;
 
     LDAPDebug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
 
@@ -250,14 +251,31 @@
         slapi_pblock_get (pb, SLAPI_PWPOLICY, &pw_response_requested);
     }
 
-    log_bind_access(pb, dn, method, version, saslmech, NULL);
+    PR_Lock( pb->pb_conn->c_mutex );
 
     /* According to RFC2251,
      * "if the bind fails, the connection will be treated as anonymous".
      */
-    PR_Lock( pb->pb_conn->c_mutex );
-    bind_credentials_clear( pb->pb_conn, PR_FALSE, /* conn is already locked */
+    bind_credentials_clear( pb->pb_conn, PR_FALSE, /* do not lock conn */
                             PR_FALSE /* do not clear external creds. */ );
+
+    /* LDAPI might have auto bind on, binding as anon should
+       mean bind as self in this case
+     */
+#if defined(ENABLE_AUTOBIND)
+    if((0 == dn || 0 == dn[0]) && pb->pb_conn->c_unix_local)
+    {
+        slapd_bind_local_user(pb->pb_conn);
+	
+	if(pb->pb_conn->c_dn)
+	{
+            auto_bind = 1; /* flag the bind method */
+	    dn = slapi_ch_strdup(pb->pb_conn->c_dn);
+	    slapi_sdn_init_dn_passin(&sdn,dn);
+	}
+    }
+#endif /* ENABLE_AUTOBIND */
+
     /* Clear the password policy flag that forbid operation
      * other than Bind, Modify, Unbind :
      * With a new bind, the flag should be reset so that the new
@@ -266,6 +284,8 @@
     pb->pb_conn->c_needpw = 0;
     PR_Unlock( pb->pb_conn->c_mutex );
 
+    log_bind_access(pb, dn, method, version, saslmech, NULL);
+
     switch ( version ) {
     case LDAP_VERSION2:
         if (method == LDAP_AUTH_SIMPLE
@@ -502,22 +522,31 @@
 			/* get the entry now, so that we can give it to check_account_lock and reslimit_update_from_dn */
             if (! slapi_be_is_flag_set(be, SLAPI_BE_FLAG_REMOTE_DATA)) {
 				bind_target_entry = get_entry(pb,  slapi_sdn_get_ndn(&sdn));
-				rc = check_account_lock ( pb, bind_target_entry, pw_response_requested);
+				rc = check_account_lock ( pb, bind_target_entry, pw_response_requested,0);
             }
 
             slapi_pblock_set( pb, SLAPI_PLUGIN, be->be_database );
             set_db_default_result_handlers(pb);
-            if ( (rc != 1) && (((rc = (*be->be_bind)( pb ))
+            if ( (rc != 1) && (auto_bind || (((rc = (*be->be_bind)( pb ))
                                 == SLAPI_BIND_SUCCESS ) || rc
-                               == SLAPI_BIND_ANONYMOUS )) {
+                               == SLAPI_BIND_ANONYMOUS ))) {
                 long t;
                 {
                     char* authtype = NULL;
+
+                    if(auto_bind)
+                        rc = SLAPI_BIND_SUCCESS;
+
                     switch ( method ) {
                     case LDAP_AUTH_SIMPLE:
                         if (cred.bv_len != 0) {
                             authtype = SLAPD_AUTH_SIMPLE;
                         }
+#if defined(ENABLE_AUTOBIND)
+                        else if(auto_bind) {
+                            authtype = SLAPD_AUTH_OS;
+                        }
+#endif /* ENABLE_AUTOBIND */
                         break;
                     case LDAP_AUTH_SASL:
                         /* authtype = SLAPD_AUTH_SASL && saslmech: */
@@ -529,7 +558,8 @@
                     }
 
                     if ( rc == SLAPI_BIND_SUCCESS ) {
-                        bind_credentials_set( pb->pb_conn,
+			if(!auto_bind)
+                            bind_credentials_set( pb->pb_conn,
                                               authtype, slapi_ch_strdup(
                                                   slapi_sdn_get_ndn(&sdn)),
                                               NULL, NULL, NULL, bind_target_entry );
@@ -545,7 +575,7 @@
                     }
                 }
 
-                if ( rc != SLAPI_BIND_ANONYMOUS &&
+                if ( 0 == auto_bind && rc != SLAPI_BIND_ANONYMOUS &&
                      ! slapi_be_is_flag_set(be,
                                             SLAPI_BE_FLAG_REMOTE_DATA)) {
                     /* check if need new password before sending 


Index: configdse.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/configdse.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configdse.c	10 Nov 2006 23:45:40 -0000	1.6
+++ configdse.c	27 Feb 2007 02:57:29 -0000	1.7
@@ -65,6 +65,8 @@
 static const char *requires_restart[] = {
     "cn=config:nsslapd-port",
     "cn=config:nsslapd-secureport",
+    "cn=config:" CONFIG_LDAPI_FILENAME_ATTRIBUTE,
+    "cn=config:" CONFIG_LDAPI_SWITCH_ATTRIBUTE,
     "cn=config:nsslapd-workingdir",
     "cn=config:nsslapd-plugin",
     "cn=config:nsslapd-sslclientauth",


Index: connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/connection.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- connection.c	10 Nov 2006 23:45:40 -0000	1.13
+++ connection.c	27 Feb 2007 02:57:29 -0000	1.14
@@ -511,21 +511,27 @@
 	{
 		int i = 1;
 		int ret = 0;
-		/* Set TCP_CORK here */
-		ret = setsockopt(conn->c_sd,IPPROTO_TCP,TCP_CORK,&i,sizeof(i));
-		if (ret < 0) {
-			LDAPDebug(LDAP_DEBUG_ANY, "Failed to set TCP_CORK on connection %d\n",conn->c_connid, 0, 0);
+		/* Set TCP_CORK here but only if this is not LDAPI */
+		if(!conn->c_unix_local)
+		{
+			ret = setsockopt(conn->c_sd,IPPROTO_TCP,TCP_CORK,&i,sizeof(i));
+			if (ret < 0) {
+				LDAPDebug(LDAP_DEBUG_ANY, "Failed to set TCP_CORK on connection %d\n",conn->c_connid, 0, 0);
+			}
 		}
 #endif
 
 		do_search( pb );
 
 #if defined(LINUX)
-		/* Clear TCP_CORK to flush any unsent data */
+		/* Clear TCP_CORK to flush any unsent data but only if not LDAPI*/
 		i = 0;
-		ret = setsockopt(conn->c_sd,IPPROTO_TCP,TCP_CORK,&i,sizeof(i));
-		if (ret < 0) {
-			LDAPDebug(LDAP_DEBUG_ANY, "Failed to clear TCP_CORK on connection %d\n",conn->c_connid, 0, 0);
+		if(!conn->c_unix_local)
+		{
+			ret = setsockopt(conn->c_sd,IPPROTO_TCP,TCP_CORK,&i,sizeof(i));
+			if (ret < 0) {
+				LDAPDebug(LDAP_DEBUG_ANY, "Failed to clear TCP_CORK on connection %d\n",conn->c_connid, 0, 0);
+			}
 		}
 	}
 #endif


Index: daemon.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- daemon.c	10 Nov 2006 23:45:40 -0000	1.11
+++ daemon.c	27 Feb 2007 02:57:30 -0000	1.12
@@ -92,6 +92,10 @@
 
 #include "fe.h"
 
+#if defined(ENABLE_LDAPI)
+#include "getsocketpeer.h"
+#endif /* ENABLE_LDAPI */
+
 /*
  * Define the backlog number for use in listen() call.
  * We use the same definition as in ldapserver/include/base/systems.h
@@ -125,6 +129,7 @@
 #define FDS_SIGNAL_PIPE 0
 #define FDS_N_TCPS      1
 #define FDS_S_TCPS      2
+#define FDS_I_UNIX	3
 
 static int get_configured_connection_table_size();
 #ifdef RESOLVER_NEEDS_LOW_FILE_DESCRIPTORS
@@ -135,11 +140,11 @@
 static int createlistensocket(unsigned short port, const PRNetAddr *listenaddr);
 #endif
 static PRFileDesc *createprlistensocket(unsigned short port,
-	const PRNetAddr *listenaddr, int secure);
+	const PRNetAddr *listenaddr, int secure, int local);
 static const char *netaddr2string(const PRNetAddr *addr, char *addrbuf,
 	size_t addrbuflen);
 static void	set_shutdown (int);
-static void setup_pr_read_pds(Connection_Table *ct, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRIntn *num_to_read);
+static void setup_pr_read_pds(Connection_Table *ct, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRFileDesc *i_unix, PRIntn *num_to_read);
 
 #ifdef HPUX10
 static void* catch_signals();
@@ -274,7 +279,7 @@
 
 static int
 accept_and_configure(int s, PRFileDesc *pr_acceptfd, PRNetAddr *pr_netaddr, 
-	int addrlen, int secure, PRFileDesc **pr_clonefd)
+	int addrlen, int secure, int local, PRFileDesc **pr_clonefd)
 {
 	int ns = 0;
 
@@ -290,7 +295,7 @@
 		return(SLAPD_INVALID_SOCKET);
 	}
 
-	ns = configure_pr_socket( pr_clonefd, secure );
+	ns = configure_pr_socket( pr_clonefd, secure, local );
 
 #else /* Windows */
 	if( secure ) {
@@ -316,7 +321,7 @@
 			return(SLAPD_INVALID_SOCKET);
 		}
 
-		ns = configure_pr_socket( pr_clonefd, secure );
+		ns = configure_pr_socket( pr_clonefd, secure, local );
 
 	} else { /* !secure */
 		struct sockaddr *addr; /* NOT IPv6 enabled */
@@ -364,11 +369,11 @@
 #endif
 /* GGOODREPL static void handle_timeout( void ); */
 static void handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll);
-static int handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, int secure );
+static int handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, int secure, int local );
 #ifdef _WIN32
 static void unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, int n_tcps, PRFileDesc *s_tcps);
 #else
-static void unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, PRFileDesc *n_tcps, PRFileDesc *s_tcps);
+static void unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRFileDesc *i_unix);
 #endif
 static int write_pid_file();
 static int init_shutdown_detect();
@@ -392,13 +397,13 @@
 											 &ports->n_listenaddr);
 #else
 		ports->n_socket = createprlistensocket(ports->n_port,
-											 &ports->n_listenaddr, 0);
+											 &ports->n_listenaddr, 0, 0);
 #endif
 	}
 
 	if ( config_get_security() && (0 != ports->s_port) ) {
 		ports->s_socket = createprlistensocket((unsigned short)ports->s_port,
-		    &ports->s_listenaddr, 1);
+		    &ports->s_listenaddr, 1, 0);
 #ifdef XP_WIN32
 		ports->s_socket_native = PR_FileDesc2NativeHandle(ports->s_socket);
 #endif
@@ -409,6 +414,15 @@
 #endif
 	}
 
+#ifndef XP_WIN32
+#if defined(ENABLE_LDAPI)
+	/* ldapi */
+	if(0 != ports->i_port) {
+		ports->i_socket = createprlistensocket(1, &ports->i_listenaddr, 0, 1);
+	}
+#endif /* ENABLE_LDAPI */
+#endif
+
 	return( rc );
 }
 
@@ -460,8 +474,8 @@
 
 void slapd_daemon( daemon_ports_t *ports )
 {
-	/* We are passed a pair of ports---one for regular connections, the
-	 * other for SSL connections.
+	/* We are passed some ports---one for regular connections, one
+	 * for SSL connections, one for ldapi connections.
 	 */
 	/* Previously there was a ton of code #defined on NET_SSL. 
 	 * This looked horrible, so now I'm doing it this way:
@@ -475,6 +489,7 @@
 #else
 	PRFileDesc *n_tcps = NULL; 
 	PRFileDesc *tcps = 0;
+	PRFileDesc *i_unix = 0;
 #endif
 	PRFileDesc *s_tcps = NULL; 
 	PRIntn num_poll = 0;
@@ -504,16 +519,24 @@
 	s_tcps = ports->s_socket;
 #ifdef XP_WIN32
 	s_tcps_native = ports->s_socket_native;
+#else
+#if defined(ENABLE_LDAPI)
+	i_unix = ports->i_socket;
+#endif /* ENABLE_LDAPI */
 #endif
 	
 	createsignalpipe();
 
 	init_shutdown_detect();
 
+	if (
 #if defined( XP_WIN32 )
-	if ( (n_tcps == SLAPD_INVALID_SOCKET) && 
+		(n_tcps == SLAPD_INVALID_SOCKET) && 
 #else
-	if ( (n_tcps == NULL) && 
+		(n_tcps == NULL) &&
+#if defined(ENABLE_LDAPI)
+		(i_unix == NULL) &&
+#endif /* ENABLE_LDAPI */
 #endif
 	    (s_tcps == NULL) ) {	/* nothing to do */
 	    LDAPDebug( LDAP_DEBUG_ANY,
@@ -521,7 +544,7 @@
 	    exit( 1 );
 	}
 
-	unfurl_banners(the_connection_table,ports,n_tcps,s_tcps);
+	unfurl_banners(the_connection_table,ports,n_tcps,s_tcps,i_unix);
 	init_op_threads ();
 	detect_timeout_support();
 
@@ -580,6 +603,21 @@
 		g_set_shutdown( SLAPI_SHUTDOWN_EXIT );
 	}
 
+#if !defined( XP_WIN32 )
+#if defined(ENABLE_LDAPI)
+	if( i_unix != NULL &&
+		PR_Listen(i_unix, DAEMON_LISTEN_SIZE) == PR_FAILURE) {
+		PRErrorCode prerr = PR_GetError();
+		slapi_log_error(SLAPI_LOG_FATAL, "slapd_daemon",
+			"listen() on %s failed: error %d (%s)\n",
+			ports->i_listenaddr.local.path,
+			prerr,
+			slapd_pr_strerror( prerr ));
+		g_set_shutdown( SLAPI_SHUTDOWN_EXIT );
+	}
+#endif /* ENABLE_LDAPI */
+#endif
+
 	/* Now we write the pid file, indicating that the server is finally and listening for connections */
 	write_pid_file();
 
@@ -593,6 +631,8 @@
 #endif
 		int select_return = 0;
 		int secure = 0; /* is a new connection an SSL one ? */
+		int local = 0; /* is new connection an ldapi one? */
+
 #ifndef _WIN32
 		PRErrorCode prerr;
 #endif
@@ -603,7 +643,7 @@
 		/* This select needs to timeout to give the server a chance to test for shutdown */
 		select_return = select(connection_table_size, &readfds, NULL, 0, &wakeup_timer);
 #else
-		setup_pr_read_pds(the_connection_table,n_tcps,s_tcps,&num_poll);
+		setup_pr_read_pds(the_connection_table,n_tcps,s_tcps,i_unix,&num_poll);
 		select_return = POLL_FN(the_connection_table->fd, num_poll, pr_timeout);
 #endif
 		switch (select_return) {
@@ -629,11 +669,11 @@
 #ifdef _WIN32
 			/* If so, then handle a new connection */
 			if ( n_tcps != SLAPD_INVALID_SOCKET && FD_ISSET( n_tcps,&readfds ) ) {
-				handle_new_connection(the_connection_table,n_tcps,NULL,0);
+				handle_new_connection(the_connection_table,n_tcps,NULL,0,0);
 			} 
 			/* If so, then handle a new connection */
 			if ( s_tcps != SLAPD_INVALID_SOCKET && FD_ISSET( s_tcps_native,&readfds ) ) {
-				handle_new_connection(the_connection_table,SLAPD_INVALID_SOCKET,s_tcps,1);
+				handle_new_connection(the_connection_table,SLAPD_INVALID_SOCKET,s_tcps,1,0);
 			} 
 			/* handle new data ready */
 			handle_read_ready(the_connection_table,&readfds);
@@ -650,9 +690,17 @@
 				tcps = s_tcps;
 				secure = 1;
 			}
+#if defined(ENABLE_LDAPI)
+			else if ( i_unix != 0 &&
+				the_connection_table->fd[FDS_I_UNIX].out_flags & SLAPD_POLL_FLAGS ) {
+				tcps = i_unix;
+				local = 1;
+			}
+#endif /* ENABLE_LDAPI */
+
 			/* If so, then handle a new connection */
 			if ( tcps != NULL ) {
-				handle_new_connection(the_connection_table,SLAPD_INVALID_SOCKET,tcps,secure);
+				handle_new_connection(the_connection_table,SLAPD_INVALID_SOCKET,tcps,secure,local);
 			}
 			/* handle new data ready */
 			handle_pr_read_ready(the_connection_table, connection_table_size);
@@ -674,11 +722,18 @@
 #ifdef _WIN32
 	if ( n_tcps != SLAPD_INVALID_SOCKET ) {
 		closesocket( n_tcps );
+	}
 #else
 	if ( n_tcps != NULL ) {
 		PR_Close( n_tcps );
-#endif
 	}
+
+	if ( i_unix != NULL ) {
+		PR_Close( i_unix );
+	}
+
+#endif
+
 	if ( s_tcps != NULL ) {
  		PR_Close( s_tcps );
 	}
@@ -934,7 +989,7 @@
 
 static int first_time_setup_pr_read_pds = 1;
 static void
-setup_pr_read_pds(Connection_Table *ct, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRIntn *num_to_read)
+setup_pr_read_pds(Connection_Table *ct, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRFileDesc *i_unix, PRIntn *num_to_read)
 {
 	Connection *c= NULL;
 	Connection *next= NULL;
@@ -999,7 +1054,19 @@
         ct->fd[FDS_S_TCPS].fd = NULL;
     }
 
-#if !defined(_WIN32) 
+#if !defined(_WIN32)
+	/* The fds entry for i_unix is always FDS_I_UNIX */
+	if (i_unix != NULL && accept_new_connections)
+	{
+		ct->fd[FDS_I_UNIX].fd = i_unix;
+		ct->fd[FDS_I_UNIX].in_flags = SLAPD_POLL_FLAGS;
+		ct->fd[FDS_I_UNIX].out_flags = 0;
+		LDAPDebug( LDAP_DEBUG_HOUSE,
+			"listening for LDAPI connections on %d\n", socketdesc, 0, 0 );
+	} else {
+		ct->fd[FDS_S_TCPS].fd = NULL;
+	}
+ 
 	/* The fds entry for the signalpipe is always FDS_SIGNAL_PIPE */
 	ct->fd[FDS_SIGNAL_PIPE].fd = signalpipe[0];
 	ct->fd[FDS_SIGNAL_PIPE].in_flags = SLAPD_POLL_FLAGS;
@@ -1013,8 +1080,9 @@
     /* count is the number of entries we've place in the fds array.
      * we always put n_tcps in slot FDS_N_TCPS, s_tcps in slot
      * FDS_S_TCPS and the signal pipe in slot FDS_SIGNAL_PIPE
-     * so we now set count to 3 */
-    count = 3;
+     * and i_unix in FDS_I_UNIX
+     * so we now set count to 4 */
+    count = 4;
     
     /* Walk down the list of active connections to find 
 	 * out which connections we should poll over.  If a connection
@@ -1798,10 +1866,271 @@
         connection_type= factory_register_type(SLAPI_EXT_CONNECTION,offsetof(Connection,c_extension));
 	}
 }
-	
+
+#if defined(ENABLE_LDAPI)
+int
+slapd_identify_local_user(Connection *conn)
+{
+	int ret = -1;
+	uid_t uid = 0;
+	gid_t gid = 0;
+
+	if(0 == slapd_get_socket_peer(conn->c_prfd, &uid, &gid))
+	{
+		conn->c_local_uid = uid;
+		conn->c_local_gid = gid;
+
+		ret = 0;
+	}
+
+	return ret;
+}
+
+#if defined(ENABLE_AUTOBIND)
+int
+slapd_bind_local_user(Connection *conn)
+{
+	int ret = -1;
+	uid_t uid = conn->c_local_uid;
+	gid_t gid = conn->c_local_gid;
+
+	/* observe configuration for auto binding */
+	/* bind at all? */
+	if(config_get_ldapi_bind_switch())
+	{
+		/* map users to a dn
+		   root may also map to an entry
+		*/
+
+		/* require real entry? */
+		if(config_get_ldapi_map_entries())
+		{
+			/* get uid type to map to (e.g. uidNumber) */
+			char *utype = config_get_ldapi_uidnumber_type();
+			/* get gid type to map to (e.g. gidNumber) */
+			char *gtype = config_get_ldapi_gidnumber_type();
+			/* get base dn for search */
+			char *base_dn = config_get_ldapi_search_base_dn();
+
+			/* search vars */
+			Slapi_PBlock *search_pb = 0;
+			Slapi_Entry **entries = 0;
+			int result;
+
+			/* filter manipulation vars */
+			char *one_type = 0;
+			char *filter_tpl = 0;
+			char *filter = 0;
+
+			/* create filter, matching whatever is given */
+			if(utype && gtype)
+			{
+				filter_tpl = "(&(%s=%u)(%s=%u))";
+			}
+			else
+			{
+				if(utype || gtype)
+				{
+					filter_tpl = "(%s=%u)";
+					if(utype)
+						one_type = utype;
+					else
+						one_type = gtype;
+				}
+				else
+				{
+					goto entry_map_free;
+				}
+			}
+
+			if(one_type)
+			{
+				if(one_type == utype)
+					filter = slapi_ch_smprintf(filter_tpl,
+						utype, uid);
+				else
+					filter = slapi_ch_smprintf(filter_tpl,
+						gtype, gid);
+			}
+			else
+			{
+				filter = slapi_ch_smprintf(filter_tpl, 
+					utype, uid, gtype, gid);
+			}
+
+			/* search for single entry matching types */
+			search_pb = slapi_pblock_new();
+
+			slapi_search_internal_set_pb(
+				search_pb, 
+				base_dn,
+				LDAP_SCOPE_SUBTREE,
+               			filter, 
+				NULL, 0, NULL, NULL, 
+				(void*)plugin_get_default_component_id(), 
+				0);
+
+			slapi_search_internal_pb(search_pb);
+			slapi_pblock_get(
+				search_pb,
+				SLAPI_PLUGIN_INTOP_RESULT, 
+				&result);
+			if(LDAP_SUCCESS == result)
+				 slapi_pblock_get(
+					search_pb,
+					SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES,
+					&entries);
+
+			if(entries)
+			{
+				/* zero or multiple entries fail */
+				if(entries[0] && 0 == entries[1])
+				{
+					/* observe account locking */
+					ret = check_account_lock(
+						0,  /* pb not req */
+						entries[0],
+						0, /* no response control */
+						1  /* inactivation only */
+						);
+
+					if(0 == ret)
+					{
+						char *auth_dn = slapi_ch_strdup(
+							slapi_entry_get_ndn(
+								entries[0]));
+
+						auth_dn = slapi_dn_normalize(
+							auth_dn);
+
+						bind_credentials_set_nolock(
+							conn,
+							SLAPD_AUTH_OS,
+							auth_dn,
+							NULL, NULL,
+							NULL , entries[0]);
+
+						ret = 0;
+					}
+				}
+			}
+
+entry_map_free:
+			/* auth_dn consumed by bind creds set */
+			slapi_free_search_results_internal(search_pb);
+			slapi_pblock_destroy(search_pb);
+			slapi_ch_free_string(&filter);
+			slapi_ch_free_string(&utype);
+                        slapi_ch_free_string(&gtype);
+                        slapi_ch_free_string(&base_dn);
+		}
+
+		if(ret && 0 == uid)
+		{
+			/* map unix root (uidNumber:0)? */
+			char *root_dn = config_get_ldapi_root_dn();
+
+			if(root_dn)
+			{
+				Slapi_DN *edn = slapi_sdn_new_dn_byref(
+					 slapi_dn_normalize(root_dn));
+				Slapi_Entry *e = 0;
+
+				/* root might be locked too! :) */
+				ret =  slapi_search_internal_get_entry(
+					edn, 0,
+        				&e,
+					(void*)plugin_get_default_component_id()
+
+					);	
+
+				if(0 == ret && e)
+				{
+					ret = check_account_lock(
+						0, /* pb not req */
+						e,
+						0, /* no response control */
+						1  /* inactivation only */
+						);
+
+					if(1 == ret)
+						/* sorry root,
+						 * just not cool enough
+						*/
+						goto root_map_free;
+				}
+
+				/* it's ok not to find the entry,
+				 * dn doesn't have to have an entry
+				 * e.g. cn=Directory Manager
+				 */
+				bind_credentials_set_nolock( 
+					conn, SLAPD_AUTH_OS, root_dn,
+					NULL, NULL, NULL , e);
+
+root_map_free:
+				/* root_dn consumed by bind creds set */
+				slapi_sdn_free(&edn);
+				slapi_entry_free(e);
+				ret = 0;
+			}
+		}
+
+		if(ret) 
+		{
+			/* create phony auth dn? */
+			char *base = config_get_ldapi_auto_dn_suffix();
+			if(base)
+			{
+				char *tpl = "gidNumber=%u+uidNumber=%u,";
+				int len = 
+				strlen(tpl) + 
+					strlen(base) +
+					51 /* uid,gid,null,w/padding */
+					;
+				char *dn_str = (char*)slapi_ch_malloc(
+					len);
+				char *auth_dn = (char*)slapi_ch_malloc(
+					len);
+
+				dn_str[0] = 0;
+				strcpy(dn_str, tpl);
+				strcat(dn_str, base);
+
+				sprintf(auth_dn, dn_str, gid, uid);
+
+				auth_dn = slapi_dn_normalize(auth_dn);
+
+				bind_credentials_set_nolock(
+					conn,
+					SLAPD_AUTH_OS,
+					auth_dn,
+                               		NULL, NULL, NULL , NULL);
+
+				/* auth_dn consumed by bind creds set */
+				slapi_ch_free_string(&dn_str);
+				slapi_ch_free_string(&base);
+				ret = 0;
+			}
+		}
+	}
+
+bail:
+	/* if all fails, the peer is anonymous */
+	if(conn->c_dn)
+	{
+		/* log the auto bind */
+		slapi_log_access(LDAP_DEBUG_STATS, "conn=%d AUTOBIND dn=\"%s\"\n", conn->c_connid, conn->c_dn);
+	}
+
+	return ret;
+}	
+#endif /* ENABLE_AUTOBIND */
+#endif /* ENABLE_LDAPI */
+
 /* NOTE: this routine is not reentrant */
 static int
-handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, int secure)
+handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, int secure, int local)
 {
 	int ns = 0;
 	Connection *conn = NULL;
@@ -1810,7 +2139,7 @@
 	PRFileDesc *pr_clonefd = NULL;
 
 	if ( (ns = accept_and_configure( tcps, pr_acceptfd, &from,
-		sizeof(from), secure, &pr_clonefd)) == SLAPD_INVALID_SOCKET ) {
+		sizeof(from), secure, local, &pr_clonefd)) == SLAPD_INVALID_SOCKET ) {
 		return -1;
 	}
 
@@ -1935,6 +2264,21 @@
 		connection_table_move_connection_on_to_active_list(the_connection_table,conn);
 	}
 
+#if defined(ENABLE_LDAPI)
+#if !defined( XP_WIN32 )
+        /* ldapi */
+        if( local )
+        {
+                conn->c_unix_local = 1;
+		slapd_identify_local_user(conn);
+
+#if defined(ENABLE_AUTOBIND)
+                slapd_bind_local_user(conn);
+#endif /* ENABLE_AUTOBIND */
+        }
+#endif
+#endif /* ENABLE_LDAPI */
+
 	PR_Unlock( conn->c_mutex );
 
 	connection_new_private(conn);
@@ -2019,7 +2363,7 @@
 unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, int n_tcps, PRFileDesc *s_tcps)
 #else
 static void
-unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, PRFileDesc *n_tcps, PRFileDesc *s_tcps)
+unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRFileDesc *i_unix)
 #endif
 {
 	slapdFrontendConfig_t	*slapdFrontendConfig = getFrontendConfig();
@@ -2079,6 +2423,18 @@
 			netaddr2string(&ports->s_listenaddr, addrbuf, sizeof(addrbuf)),
 		    ports->s_port, 0 );
 	}
+
+#if !defined( XP_WIN32 )
+#if defined(ENABLE_LDAPI)
+	if ( i_unix != NULL ) {                                 /* LDAPI */
+		LDAPDebug( LDAP_DEBUG_ANY,
+			"Listening on %s for LDAPI requests\n",
+			ports->i_listenaddr.local.path,
+			0, 0 );
+	}
+#endif /* ENABLE_LDAPI */
+#endif
+
 }
 
 #if defined( _WIN32 )
@@ -2273,7 +2629,7 @@
 
 static PRFileDesc *
 createprlistensocket(PRUint16 port, const PRNetAddr *listenaddr,
-		int secure)
+		int secure, int local)
 {
 	PRFileDesc			*sock;
 	PRNetAddr			sa_server;
@@ -2281,16 +2637,26 @@
 	PRSocketOptionData	pr_socketoption;
 	char				addrbuf[ 256 ];
 	char				*logname = "createprlistensocket";
+	int                             socktype = PR_AF_INET6;
+	char                            *socktype_s = "PR_AF_INET";
 
 	if (!port) goto suppressed;
 
 	PR_ASSERT( listenaddr != NULL );
 
+#if defined(ENABLE_LDAPI)
+	if(local) { /* ldapi */
+		socktype = PR_AF_LOCAL;
+		socktype_s = "PR_AF_LOCAL";
+	}
+#endif /* ENABLE_LDAPI */
+
 	/* create TCP socket */
-	if ((sock = PR_OpenTCPSocket(PR_AF_INET6)) == SLAPD_INVALID_SOCKET) {
+	if ((sock = PR_OpenTCPSocket(socktype)) == SLAPD_INVALID_SOCKET) {
 		prerr = PR_GetError();
 		slapi_log_error(SLAPI_LOG_FATAL, logname,
-		    "PR_OpenTCPSocket(PR_AF_INET6) failed: %s error %d (%s)\n",
+		    "PR_OpenTCPSocket(%s) failed: %s error %d (%s)\n",
+		    socktype_s,
 		    SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
 		goto failed;
 	}
@@ -2307,17 +2673,44 @@
 
 	/* set up listener address, including port */
 	memcpy(&sa_server, listenaddr, sizeof(sa_server));
-	PRLDAP_SET_PORT( &sa_server, port );
+
+	if(!local)
+		PRLDAP_SET_PORT( &sa_server, port );
 
 	if ( PR_Bind(sock, &sa_server) == PR_FAILURE) {
 		prerr = PR_GetError();
-		slapi_log_error(SLAPI_LOG_FATAL, logname,
+		if(!local)
+		{
+			slapi_log_error(SLAPI_LOG_FATAL, logname,
 				"PR_Bind() on %s port %d failed: %s error %d (%s)\n",
 				netaddr2string(&sa_server, addrbuf, sizeof(addrbuf)), port,
 				SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
+		}
+#if defined(ENABLE_LDAPI)
+		else
+		{
+                        slapi_log_error(SLAPI_LOG_FATAL, logname,
+                                "PR_Bind() on %s file %s failed: %s error %d (%s)\n",
+                                netaddr2string(&sa_server, addrbuf, sizeof(addrbuf)),
+				sa_server.local.path,
+                                SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
+		}
+#endif /* ENABLE_LDAPI */
+
 		goto failed;	
 	}
 
+#if defined(ENABLE_LDAPI)
+	if(local)
+	{
+		if(chmod(listenaddr->local.path,
+			S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))
+		{
+			slapi_log_error(SLAPI_LOG_FATAL, logname, "err: %d", errno);
+		}
+	}
+#endif /* ENABLE_LDAPI */
+
 	return( sock );
 
 failed:
@@ -2536,7 +2929,7 @@
 
 
 
-int configure_pr_socket( PRFileDesc **pr_socket, int secure )
+int configure_pr_socket( PRFileDesc **pr_socket, int secure, int local )
 {
 	int ns = 0;
 	int reservedescriptors = config_get_reservedescriptors();
@@ -2617,7 +3010,7 @@
 	} /* else (secure) */
 
 
-	if ( !enable_nagle ) {
+	if ( !enable_nagle && !local ) {
 
 		 pr_socketoption.option = PR_SockOpt_NoDelay;
 		 pr_socketoption.value.no_delay = 1;
@@ -2628,7 +3021,7 @@
 					SLAPI_COMPONENT_NAME_NSPR " error %d (%s)\n",
 					prerr, slapd_pr_strerror( prerr ), 0 );
 		 }
-	} else {
+	} else if( !local) {
 		 pr_socketoption.option = PR_SockOpt_NoDelay;
 		 pr_socketoption.value.no_delay = 0;
 		 if ( PR_SetSocketOption( *pr_socket, &pr_socketoption ) == PR_FAILURE) {


Index: fe.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/fe.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fe.h	10 Nov 2006 23:45:40 -0000	1.5
+++ fe.h	27 Feb 2007 02:57:30 -0000	1.6
@@ -173,7 +173,7 @@
 int read_function(int ignore, void *buffer,  int count, struct lextiof_socket_private *handle );
 int write_function(int ignore, const void *buffer,  int count, struct lextiof_socket_private *handle );
 PRFileDesc * get_ssl_listener_fd();
-int configure_pr_socket( PRFileDesc **pr_socket, int secure );
+int configure_pr_socket( PRFileDesc **pr_socket, int secure, int local );
 void configure_ns_socket( int * ns );
 
 /*


Index: libglobs.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libglobs.c	10 Nov 2006 23:45:40 -0000	1.14
+++ libglobs.c	27 Feb 2007 02:57:30 -0000	1.15
@@ -459,6 +459,33 @@
 	{CONFIG_LISTENHOST_ATTRIBUTE, config_set_listenhost,
 		NULL, 0,
 		(void**)&global_slapdFrontendConfig.listenhost, CONFIG_STRING, NULL},
+	{CONFIG_LDAPI_FILENAME_ATTRIBUTE, config_set_ldapi_filename,
+                NULL, 0,
+                (void**)&global_slapdFrontendConfig.ldapi_filename, CONFIG_STRING, NULL},
+        {CONFIG_LDAPI_SWITCH_ATTRIBUTE, config_set_ldapi_switch,
+                NULL, 0,
+		(void**)&global_slapdFrontendConfig.ldapi_switch, CONFIG_ON_OFF, NULL},
+        {CONFIG_LDAPI_BIND_SWITCH_ATTRIBUTE, config_set_ldapi_bind_switch,
+                NULL, 0,
+		(void**)&global_slapdFrontendConfig.ldapi_bind_switch, CONFIG_ON_OFF, NULL},
+        {CONFIG_LDAPI_ROOT_DN_ATTRIBUTE, config_set_ldapi_root_dn,
+                NULL, 0,
+		(void**)&global_slapdFrontendConfig.ldapi_root_dn, CONFIG_STRING, NULL},
+        {CONFIG_LDAPI_MAP_ENTRIES_ATTRIBUTE, config_set_ldapi_map_entries,
+                NULL, 0,
+		(void**)&global_slapdFrontendConfig.ldapi_map_entries, CONFIG_ON_OFF, NULL},
+        {CONFIG_LDAPI_UIDNUMBER_TYPE_ATTRIBUTE, config_set_ldapi_uidnumber_type,
+                NULL, 0,
+		(void**)&global_slapdFrontendConfig.ldapi_uidnumber_type, CONFIG_STRING, NULL},
+        {CONFIG_LDAPI_GIDNUMBER_TYPE_ATTRIBUTE, config_set_ldapi_gidnumber_type,
+                NULL, 0,
+		(void**)&global_slapdFrontendConfig.ldapi_gidnumber_type, CONFIG_STRING, NULL},
+        {CONFIG_LDAPI_SEARCH_BASE_DN_ATTRIBUTE, config_set_ldapi_search_base_dn,
+                NULL, 0,
+		(void**)&global_slapdFrontendConfig.ldapi_search_base_dn, CONFIG_STRING, NULL},
+        {CONFIG_LDAPI_AUTO_DN_SUFFIX_ATTRIBUTE, config_set_ldapi_auto_dn_suffix,
+                NULL, 0,
+		(void**)&global_slapdFrontendConfig.ldapi_auto_dn_suffix, CONFIG_STRING, NULL},
 	{CONFIG_ACCESSLOG_MINFREEDISKSPACE_ATTRIBUTE, NULL,
 		log_set_mindiskspace, SLAPD_ACCESS_LOG,
 		(void**)&global_slapdFrontendConfig.accesslog_minfreespace, CONFIG_INT, NULL},
@@ -750,6 +777,15 @@
 				
   cfg->port = LDAP_PORT;
   cfg->secureport = LDAPS_PORT;
+  cfg->ldapi_filename = slapi_ch_strdup(SLAPD_LDAPI_DEFAULT_FILENAME);
+  cfg->ldapi_switch = LDAP_ON;
+  cfg->ldapi_bind_switch = LDAP_OFF;
+  cfg->ldapi_root_dn = slapi_ch_strdup("cn=Directory Manager");
+  cfg->ldapi_map_entries = LDAP_OFF;
+  cfg->ldapi_uidnumber_type = slapi_ch_strdup("uidNumber");
+  cfg->ldapi_gidnumber_type = slapi_ch_strdup("gidNumber");
+  cfg->ldapi_search_base_dn = slapi_ch_strdup("dc=example, dc=com");
+  cfg->ldapi_auto_dn_suffix = slapi_ch_strdup("cn=peercred,cn=external,cn=auth");
   cfg->threadnumber = SLAPD_DEFAULT_MAX_THREADS;
   cfg->maxthreadsperconn = SLAPD_DEFAULT_MAX_THREADS_PER_CONN;
   cfg->reservedescriptors = SLAPD_DEFAULT_RESERVE_FDS;
@@ -991,7 +1027,7 @@
 
   if ( nPort == 0 ) {
         LDAPDebug( LDAP_DEBUG_ANY,
-                           "Information: Non-Secure Port Disabled, server only contactable via secure port\n", 0, 0, 0 );
+                           "Information: Non-Secure Port Disabled\n", 0, 0, 0 );
   }
   
   if ( apply ) {
@@ -1142,6 +1178,163 @@
 }
 
 int
+config_set_ldapi_filename( const char *attrname, char *value, char *errorbuf, int apply ) {
+  int retVal = LDAP_SUCCESS;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+  if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
+        return LDAP_OPERATIONS_ERROR;
+  }
+
+  if ( apply) {
+        CFG_LOCK_WRITE(slapdFrontendConfig);
+
+        slapi_ch_free ( (void **) &(slapdFrontendConfig->ldapi_filename) );
+        slapdFrontendConfig->ldapi_filename = slapi_ch_strdup ( value );
+         CFG_UNLOCK_WRITE(slapdFrontendConfig);
+  }
+  return retVal;
+}
+
+int
+config_set_ldapi_switch( const char *attrname, char *value, char *errorbuf, int apply ) {
+	int retVal = LDAP_SUCCESS;
+	slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+	retVal = config_set_onoff(attrname,
+		value,
+		&(slapdFrontendConfig->ldapi_switch),
+		errorbuf,
+		apply);
+
+	return retVal;
+}
+
+int config_set_ldapi_bind_switch( const char *attrname, char *value, char *errorbuf, int apply )
+{
+        int retVal = LDAP_SUCCESS;
+        slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+        retVal = config_set_onoff(attrname,
+                value,
+                &(slapdFrontendConfig->ldapi_bind_switch),
+                errorbuf,
+                apply);
+
+        return retVal;
+}
+
+int config_set_ldapi_root_dn( const char *attrname, char *value, char *errorbuf, int apply )
+{
+  int retVal = LDAP_SUCCESS;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+  if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
+        return LDAP_OPERATIONS_ERROR;
+  }
+
+  if ( apply) {
+        CFG_LOCK_WRITE(slapdFrontendConfig);
+
+        slapi_ch_free ( (void **) &(slapdFrontendConfig->ldapi_root_dn) );
+        slapdFrontendConfig->ldapi_root_dn = slapi_ch_strdup ( value );
+         CFG_UNLOCK_WRITE(slapdFrontendConfig);
+  }
+  return retVal;
+}
+
+int config_set_ldapi_map_entries( const char *attrname, char *value, char *errorbuf, int apply )
+{
+	int retVal = LDAP_SUCCESS;
+	slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+	retVal = config_set_onoff(attrname,
+		value,
+		&(slapdFrontendConfig->ldapi_map_entries),
+		errorbuf,
+		apply);
+
+	return retVal;
+} 
+
+int config_set_ldapi_uidnumber_type( const char *attrname, char *value, char *errorbuf, int apply )
+{
+  int retVal = LDAP_SUCCESS;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+  if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
+        return LDAP_OPERATIONS_ERROR;
+  }
+
+  if ( apply) {
+        CFG_LOCK_WRITE(slapdFrontendConfig);
+
+        slapi_ch_free ( (void **) &(slapdFrontendConfig->ldapi_uidnumber_type) );
+        slapdFrontendConfig->ldapi_uidnumber_type = slapi_ch_strdup ( value );
+         CFG_UNLOCK_WRITE(slapdFrontendConfig);
+  }
+  return retVal;
+} 
+
+int config_set_ldapi_gidnumber_type( const char *attrname, char *value, char *errorbuf, int apply )
+{
+  int retVal = LDAP_SUCCESS;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+  if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
+        return LDAP_OPERATIONS_ERROR;
+  }
+
+  if ( apply) {
+        CFG_LOCK_WRITE(slapdFrontendConfig);
+
+        slapi_ch_free ( (void **) &(slapdFrontendConfig->ldapi_gidnumber_type) );
+        slapdFrontendConfig->ldapi_gidnumber_type = slapi_ch_strdup ( value );
+         CFG_UNLOCK_WRITE(slapdFrontendConfig);
+  }
+  return retVal;
+}
+
+int config_set_ldapi_search_base_dn( const char *attrname, char *value, char *errorbuf, int apply )
+{
+  int retVal = LDAP_SUCCESS;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+  if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
+        return LDAP_OPERATIONS_ERROR;
+  }
+
+  if ( apply) {
+        CFG_LOCK_WRITE(slapdFrontendConfig);
+
+        slapi_ch_free ( (void **) &(slapdFrontendConfig->ldapi_search_base_dn) );
+        slapdFrontendConfig->ldapi_search_base_dn = slapi_ch_strdup ( value );
+         CFG_UNLOCK_WRITE(slapdFrontendConfig);
+  }
+  return retVal;
+}
+
+int config_set_ldapi_auto_dn_suffix( const char *attrname, char *value, char *errorbuf, int apply )
+{
+  int retVal = LDAP_SUCCESS;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+  if ( config_value_is_null( attrname, value, errorbuf, 0 )) {
+        return LDAP_OPERATIONS_ERROR;
+  }
+
+  if ( apply) {
+        CFG_LOCK_WRITE(slapdFrontendConfig);
+
+        slapi_ch_free ( (void **) &(slapdFrontendConfig->ldapi_auto_dn_suffix) );
+        slapdFrontendConfig->ldapi_auto_dn_suffix = slapi_ch_strdup ( value );
+         CFG_UNLOCK_WRITE(slapdFrontendConfig);
+  }
+  return retVal;
+}
+
+
+int
 config_set_securelistenhost( const char *attrname, char *value, char *errorbuf, int apply ) {
   int retVal = LDAP_SUCCESS;
   slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
@@ -3066,6 +3259,100 @@
 }
 
 char *
+config_get_ldapi_filename(){
+  char *retVal;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+  CFG_LOCK_READ(slapdFrontendConfig);
+  retVal = slapi_ch_strdup(slapdFrontendConfig->ldapi_filename);
+  CFG_UNLOCK_READ(slapdFrontendConfig);
+
+  return retVal;
+}
+
+
+int config_get_ldapi_switch(){   
+  int retVal;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); 
+  CFG_LOCK_READ(slapdFrontendConfig);
+  retVal = slapdFrontendConfig->ldapi_switch;
+  CFG_UNLOCK_READ(slapdFrontendConfig);
+
+  return retVal;
+}
+
+int config_get_ldapi_bind_switch(){
+  int retVal;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+  CFG_LOCK_READ(slapdFrontendConfig);
+  retVal = slapdFrontendConfig->ldapi_bind_switch;
+  CFG_UNLOCK_READ(slapdFrontendConfig);
+
+  return retVal;
+}
+
+char *config_get_ldapi_root_dn(){
+  char *retVal;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+  CFG_LOCK_READ(slapdFrontendConfig);
+  retVal = slapi_ch_strdup(slapdFrontendConfig->ldapi_root_dn);
+  CFG_UNLOCK_READ(slapdFrontendConfig);
+
+  return retVal;
+}
+
+int config_get_ldapi_map_entries(){
+  int retVal;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+  CFG_LOCK_READ(slapdFrontendConfig);
+  retVal = slapdFrontendConfig->ldapi_map_entries;
+  CFG_UNLOCK_READ(slapdFrontendConfig);
+
+  return retVal;
+}
+
+char *config_get_ldapi_uidnumber_type(){
+  char *retVal;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+  CFG_LOCK_READ(slapdFrontendConfig);
+  retVal = slapi_ch_strdup(slapdFrontendConfig->ldapi_uidnumber_type);
+  CFG_UNLOCK_READ(slapdFrontendConfig);
+
+  return retVal;
+}
+
+char *config_get_ldapi_gidnumber_type(){
+  char *retVal;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+  CFG_LOCK_READ(slapdFrontendConfig);
+  retVal = slapi_ch_strdup(slapdFrontendConfig->ldapi_gidnumber_type);
+  CFG_UNLOCK_READ(slapdFrontendConfig);
+
+  return retVal;
+}
+
+char *config_get_ldapi_search_base_dn(){
+  char *retVal;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+  CFG_LOCK_READ(slapdFrontendConfig);
+  retVal = slapi_ch_strdup(slapdFrontendConfig->ldapi_search_base_dn);
+  CFG_UNLOCK_READ(slapdFrontendConfig);
+
+  return retVal;
+}
+
+char *config_get_ldapi_auto_dn_suffix(){
+  char *retVal;
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+  CFG_LOCK_READ(slapdFrontendConfig);
+  retVal = slapi_ch_strdup(slapdFrontendConfig->ldapi_auto_dn_suffix);
+  CFG_UNLOCK_READ(slapdFrontendConfig);
+
+  return retVal;
+}
+
+
+char *
 config_get_workingdir() {
   slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
   char *retVal;


Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- main.c	14 Dec 2006 23:16:54 -0000	1.17
+++ main.c	27 Feb 2007 02:57:30 -0000	1.18
@@ -453,6 +453,7 @@
 static char *extraname;
 static char *myname;
 static int n_port = 0;
+static int i_port = 0;
 static int s_port = 0;
 static char **ldif_file = NULL;
 static int ldif_files = 0;
@@ -612,6 +613,7 @@
 }
 #endif /* WIN32 */
 
+
 int
 main( int argc, char **argv)
 {
@@ -854,6 +856,19 @@
 			return(1);
 		}
 
+#if defined(ENABLE_LDAPI)
+		if(	config_get_ldapi_switch() &&
+			config_get_ldapi_filename() != 0)
+		{
+			i_port = ports_info.i_port = 1; /* flag ldapi as on */
+			ports_info.i_listenaddr.local.family = PR_AF_LOCAL;
+			PL_strncpyz(ports_info.i_listenaddr.local.path,
+				config_get_ldapi_filename(),
+				sizeof(ports_info.i_listenaddr.local.path));
+			unlink(ports_info.i_listenaddr.local.path);
+		}
+#endif /* ENABLE_LDAPI */
+
 		return_value = daemon_pre_setuid_init(&ports_info);
 		if (0 != return_value) {
 			LDAPDebug( LDAP_DEBUG_ANY, "Failed to init daemon\n",
@@ -1081,6 +1096,7 @@
 		normalize_oc();
 
 		if (n_port) {
+		} else if (i_port) {
 		} else if ( config_get_security()) {
 		} else {
 #ifdef _WIN32	
@@ -1105,6 +1121,10 @@
 				MessageBox(GetDesktopWindow(), szMessage,	" ", MB_ICONEXCLAMATION | MB_OK);
 			}
 #endif
+			LDAPDebug( LDAP_DEBUG_ANY,
+                                "Fatal Error---No ports specified. "
+                                "Exiting now.\n", 0, 0, 0 );
+			
 			exit(1);
 		}
 	}


Index: passwd_extop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/passwd_extop.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- passwd_extop.c	28 Nov 2006 18:02:07 -0000	1.14
+++ passwd_extop.c	27 Feb 2007 02:57:30 -0000	1.15
@@ -592,7 +592,7 @@
 
 	 if (oldPasswd == NULL || *oldPasswd == '\0') {
      /* If user is authenticated, they already gave their password during
-        the bind operation (or used sasl or client cert auth) */
+        the bind operation (or used sasl or client cert auth or OS creds) */
         slapi_pblock_get(pb, SLAPI_CONN_AUTHMETHOD, &authmethod);
         if (!authmethod || !strcmp(authmethod, SLAPD_AUTH_NONE)) {
             errMesg = "User must be authenticated to the directory server.\n";


Index: pblock.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pblock.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pblock.c	10 Nov 2006 23:45:40 -0000	1.8
+++ pblock.c	27 Feb 2007 02:57:30 -0000	1.9
@@ -212,6 +212,8 @@
                     (*(char **)value) = SLAPD_AUTH_SIMPLE;
                 } else if (strcasecmp(authtype, SLAPD_AUTH_SSL) == 0) {
                     (*(char **)value) = SLAPD_AUTH_SSL;
+                } else if (strcasecmp(authtype, SLAPD_AUTH_OS) == 0) {
+                    (*(char **)value) = SLAPD_AUTH_OS;
                 } else if (strncasecmp(authtype, SLAPD_AUTH_SASL, 
                                        strlen(SLAPD_AUTH_SASL)) == 0) {
                     (*(char **)value) = SLAPD_AUTH_SASL;
@@ -2932,7 +2934,15 @@
 		char *extauthtype, char *externaldn, CERTCertificate *clientcert, Slapi_Entry * bind_target_entry )
 {
 	PR_Lock( conn->c_mutex );
+	bind_credentials_set_nolock(conn, authtype, normdn,
+		extauthtype, externaldn, clientcert, bind_target_entry);
+	PR_Unlock( conn->c_mutex );
+}
 
+void
+bind_credentials_set_nolock( Connection *conn, char *authtype, char *normdn,
+                char *extauthtype, char *externaldn, CERTCertificate *clientcert, Slapi_Entry * bind_target_entry )
+{
 	/* clear credentials */
 	bind_credentials_clear( conn, PR_FALSE /* conn is already locked */,
 			( extauthtype != NULL ) /* clear external creds. if requested */ );
@@ -2968,6 +2978,4 @@
 				reslimit_update_from_entry( conn, bind_target_entry );	
 		}
 	}
-
-	PR_Unlock( conn->c_mutex );
 }


Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- proto-slap.h	10 Nov 2006 23:45:40 -0000	1.25
+++ proto-slap.h	27 Feb 2007 02:57:30 -0000	1.26
@@ -239,6 +239,15 @@
 int config_set_localhost( const char *attrname, char *value, char *errorbuf, int apply );
 int config_set_listenhost( const char *attrname, char *value, char *errorbuf, int apply );
 int config_set_securelistenhost( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_ldapi_filename( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_ldapi_switch( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_ldapi_bind_switch( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_ldapi_root_dn( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_ldapi_map_entries( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_ldapi_uidnumber_type( const char *attrname, char *value, char *errorbuf, int apply );    
+int config_set_ldapi_gidnumber_type( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_ldapi_search_base_dn( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_ldapi_auto_dn_suffix( const char *attrname, char *value, char *errorbuf, int apply );   
 int config_set_srvtab( const char *attrname, char *value, char *errorbuf, int apply );
 int config_set_sizelimit( const char *attrname, char *value, char *errorbuf, int apply );
 int config_set_lastmod( const char *attrname, char *value, char *errorbuf, int apply );
@@ -334,6 +343,15 @@
 char *config_get_localhost();
 char *config_get_listenhost();
 char *config_get_securelistenhost();
+char *config_get_ldapi_filename();
+int config_get_ldapi_switch(); 
+int config_get_ldapi_bind_switch();
+char *config_get_ldapi_root_dn(); 
+int config_get_ldapi_map_entries(); 
+char *config_get_ldapi_uidnumber_type(); 
+char *config_get_ldapi_gidnumber_type(); 
+char *config_get_ldapi_search_base_dn(); 
+char *config_get_ldapi_auto_dn_suffix(); 
 char *config_get_srvtab();
 int config_get_sizelimit();
 char *config_get_pw_storagescheme();
@@ -738,7 +756,7 @@
 	char **old_pw, Slapi_Entry *e, int mod_op );
 int check_pw_syntax_ext( Slapi_PBlock *pb, const Slapi_DN *sdn, Slapi_Value **vals,
 	char **old_pw, Slapi_Entry *e, int mod_op, Slapi_Mods *smods );
-int check_account_lock( Slapi_PBlock *pb, Slapi_Entry * bind_target_entry, int pwresponse_req);
+int check_account_lock( Slapi_PBlock *pb, Slapi_Entry * bind_target_entry, int pwresponse_req, int account_inactivation_only /*no wire/no pw policy*/);
 int check_pw_minage( Slapi_PBlock *pb, const Slapi_DN *sdn, struct berval **vals) ;
 void add_password_attrs( Slapi_PBlock *pb, Operation *op, Slapi_Entry *e );
 void mod_allowchange_aci(char *val);
@@ -961,6 +979,9 @@
 void pblock_init_common( Slapi_PBlock *pb, Slapi_Backend *be, Connection *conn, Operation *op );
 void pblock_done( Slapi_PBlock *pb );
 void bind_credentials_set( Connection *conn,
+                char *authtype, char *normdn,
+                char *extauthtype, char *externaldn, CERTCertificate *clientcert , Slapi_Entry * binded);
+void bind_credentials_set_nolock( Connection *conn,
 		char *authtype, char *normdn,
 		char *extauthtype, char *externaldn, CERTCertificate *clientcert , Slapi_Entry * binded);
 void bind_credentials_clear( Connection *conn, PRBool lock_conn,


Index: pw_mgmt.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw_mgmt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pw_mgmt.c	10 Nov 2006 23:45:40 -0000	1.7
+++ pw_mgmt.c	27 Feb 2007 02:57:30 -0000	1.8
@@ -291,7 +291,7 @@
 
 /* check_account_lock is called before bind opeation; this could be a pre-op. */
 int
-check_account_lock ( Slapi_PBlock *pb, Slapi_Entry * bind_target_entry, int pwresponse_req) {
+check_account_lock ( Slapi_PBlock *pb, Slapi_Entry * bind_target_entry, int pwresponse_req, int account_inactivation_only) {
 
 	time_t		unlock_time;
 	time_t		cur_time;
@@ -312,8 +312,11 @@
 	if ( bind_target_entry == NULL ) 
 		return -1;
 
-	dn = slapi_entry_get_ndn(bind_target_entry);
-	pwpolicy = new_passwdPolicy(pb, dn);
+	if(!account_inactivation_only)
+	{
+		dn = slapi_entry_get_ndn(bind_target_entry);
+		pwpolicy = new_passwdPolicy(pb, dn);
+	}
 
 	/* kexcoff: account inactivation */
 	/* check if the entry is locked by nsAccountLock attribute - account inactivation feature */
@@ -334,11 +337,12 @@
 			if ( (bvp != NULL) && (strcasecmp(bvp->bv_val, "true") == 0) )
 			{
 				/* account inactivated */
-				if (pwresponse_req) {
+				if (!account_inactivation_only && pwresponse_req) {
 					slapi_pwpolicy_make_response_control ( pb, -1, -1,
 							LDAP_PWPOLICY_ACCTLOCKED );
 				}
-				send_ldap_result ( pb, LDAP_UNWILLING_TO_PERFORM, NULL,
+				if(!account_inactivation_only)
+					send_ldap_result ( pb, LDAP_UNWILLING_TO_PERFORM, NULL,
 							"Account inactivated. Contact system administrator.",
 							0, NULL );
 				slapi_vattr_values_free(&values, &actual_type_name, attr_free_flags);
@@ -354,7 +358,7 @@
 	/*
 	 * Check if the password policy has to be checked or not
 	 */
-	if ( pwpolicy->pw_lockout == 0 ) {
+	if ( account_inactivation_only || pwpolicy->pw_lockout == 0 ) {
 		goto notlocked;
 	}
 
@@ -412,11 +416,13 @@
 	}
 
 notlocked:
-	/* account is not locked. */ 
-	delete_passwdPolicy(&pwpolicy);
+	/* account is not locked. */
+        if(!account_inactivation_only)
+		delete_passwdPolicy(&pwpolicy);
 	return ( 0 );	
 locked:
-	delete_passwdPolicy(&pwpolicy);
+	if(!account_inactivation_only)
+		delete_passwdPolicy(&pwpolicy);
 	return (1);
 
 }


Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- saslbind.c	5 Dec 2006 21:22:09 -0000	1.22
+++ saslbind.c	27 Feb 2007 02:57:30 -0000	1.23
@@ -917,7 +917,7 @@
             {
                 break;
             } 
-            if ( check_account_lock(pb, bind_target_entry, pwresponse_requested) == 1) {
+            if ( check_account_lock(pb, bind_target_entry, pwresponse_requested, 0) == 1) {
                 slapi_entry_free(bind_target_entry);
                 break;
             }


Index: slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- slap.h	10 Nov 2006 23:45:40 -0000	1.20
+++ slap.h	27 Feb 2007 02:57:30 -0000	1.21
@@ -304,6 +304,10 @@
 /* the default schema sub directory of the config sub directory */
 #define SCHEMA_SUBDIR_NAME "schema"
 
+/* LDAPI default configuration */
+#define SLAPD_LDAPI_DEFAULT_FILENAME "/var/run/ldapi"
+#define SLAPD_LDAPI_DEFAULT_STATUS "off"
+
 struct subfilt {
 	char	*sf_type;
 	char	*sf_initial;
@@ -1249,6 +1253,9 @@
     int				c_enable_sasl_io; /* Flag to tell us to enable SASL I/O on the next read */
     int				c_sasl_io; /* Flag to tell us to enable SASL I/O on the next read */
     int				c_sasl_ssf; /* flag to tell us the SASL SSF */
+    int                         c_unix_local; /* flag true for LDAPI */
+    uid_t                         c_local_uid;  /* uid of connecting process */
+    gid_t                         c_local_gid;  /* gid of connecting process */
 } Connection;
 #define CONN_FLAG_SSL	1	/* Is this connection an SSL connection or not ? 
 							 * Used to direct I/O code when SSL is handled differently 
@@ -1456,6 +1463,11 @@
 	int		s_socket_native;
 #else
 	PRFileDesc	*n_socket;
+	/* ldapi */
+	PRNetAddr       i_listenaddr;
+	int             i_port; /* used as a flag only */
+	PRFileDesc      *i_socket;
+
 #endif
 	PRFileDesc	*s_socket;
 } daemon_ports_t;
@@ -1640,6 +1652,15 @@
 #define CONFIG_PORT_ATTRIBUTE "nsslapd-port"
 #define CONFIG_WORKINGDIR_ATTRIBUTE "nsslapd-workingdir"
 #define CONFIG_LISTENHOST_ATTRIBUTE "nsslapd-listenhost"
+#define CONFIG_LDAPI_FILENAME_ATTRIBUTE "nsslapd-ldapifilepath"
+#define CONFIG_LDAPI_SWITCH_ATTRIBUTE "nsslapd-ldapilisten"
+#define CONFIG_LDAPI_BIND_SWITCH_ATTRIBUTE "nsslapd-ldapiautobind"
+#define CONFIG_LDAPI_ROOT_DN_ATTRIBUTE "nsslapd-ldapimaprootdn"
+#define CONFIG_LDAPI_MAP_ENTRIES_ATTRIBUTE "nsslapd-ldapimaptoentries"
+#define CONFIG_LDAPI_UIDNUMBER_TYPE_ATTRIBUTE "nsslapd-ldapiuidnumbertype"
+#define CONFIG_LDAPI_GIDNUMBER_TYPE_ATTRIBUTE "nsslapd-ldapigidnumbertype"
+#define CONFIG_LDAPI_SEARCH_BASE_DN_ATTRIBUTE "nsslapd-ldapientrysearchbase"
+#define CONFIG_LDAPI_AUTO_DN_SUFFIX_ATTRIBUTE "nsslapd-ldapiautodnsuffix"
 #define CONFIG_SECURITY_ATTRIBUTE "nsslapd-security"
 #define CONFIG_SSL3CIPHERS_ATTRIBUTE "nsslapd-SSL3ciphers"
 #define CONFIG_ACCESSLOG_ATTRIBUTE "nsslapd-accesslog"
@@ -1889,6 +1910,15 @@
   int attrname_exceptions;  /* if true, allow questionable attribute names */
   int rewrite_rfc1274;		/* return attrs for both v2 and v3 names */
   char *schemareplace;		/* see CONFIG_SCHEMAREPLACE_* #defines below */
+  char *ldapi_filename;		/* filename for ldapi socket */
+  int ldapi_switch;             /* switch to turn ldapi on/off */
+  int ldapi_bind_switch;        /* switch to turn ldapi auto binding on/off */
+  char *ldapi_root_dn;          /* DN to map root to over LDAPI */
+  int ldapi_map_entries;        /* turns ldapi entry bind mapping on/off */
+  char *ldapi_uidnumber_type;   /* type that contains uid number */
+  char *ldapi_gidnumber_type;   /* type that contains gid number */
+  char *ldapi_search_base_dn;   /* base dn to search for mapped entries */
+  char *ldapi_auto_dn_suffix;   /* suffix to be appended to auto gen DNs */
 } slapdFrontendConfig_t;
 
 #define SLAPD_FULL	0
@@ -1902,6 +1932,8 @@
  
 slapdFrontendConfig_t *getFrontendConfig();
 
+int slapd_bind_local_user(Connection *conn);
+
 /* LP: NO_TIME cannot be -1, it generates wrong GeneralizedTime
  * And causes some errors on AIX also 
  */


Index: slapi-plugin.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- slapi-plugin.h	14 Dec 2006 23:16:54 -0000	1.14
+++ slapi-plugin.h	27 Feb 2007 02:57:30 -0000	1.15
@@ -1367,7 +1367,7 @@
 #define SLAPD_AUTH_SIMPLE "simple"
 #define SLAPD_AUTH_SSL    "SSL"
 #define SLAPD_AUTH_SASL   "SASL " /* followed by the mechanism name */
-
+#define SLAPD_AUTH_OS     "OS"
 
 /* Command Line Arguments */
 #define SLAPI_ARGC				147


Index: start_tls_extop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/start_tls_extop.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- start_tls_extop.c	10 Nov 2006 23:45:40 -0000	1.8
+++ start_tls_extop.c	27 Feb 2007 02:57:30 -0000	1.9
@@ -275,7 +275,8 @@
 	 * connection ready. */
 
 	secure = 1;
-	ns = configure_pr_socket( &newsocket, secure );
+	ns = configure_pr_socket( &newsocket, secure, 0 /*never local*/ );
+
 
 	/*
 	ber_sockbuf_set_option( conn->c_sb, LBER_SOCKBUF_OPT_DESC, &newsocket );
@@ -417,7 +418,7 @@
 
 #ifndef _WIN32
 	secure = 0;
-	ns = configure_pr_socket( &(c->c_prfd), secure );
+	ns = configure_pr_socket( &(c->c_prfd), secure, 0 /*never local*/ );
 
 	ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_DESC, &(c->c_prfd) );
 



From fedora-directory-commits at redhat.com  Tue Feb 27 02:57:26 2007
From: fedora-directory-commits at redhat.com (Pete Rowley (prowley))
Date: Mon, 26 Feb 2007 21:57:26 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.30,
	1.31 Makefile.in, 1.35, 1.36 aclocal.m4, 1.23, 1.24 configure,
	1.32, 1.33 configure.ac, 1.23, 1.24 ltmain.sh, 1.11, 1.12
Message-ID: <200702270257.l1R2vuVI016367@cvs-int.fedora.redhat.com>

Author: prowley

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16258

Modified Files:
	Makefile.am Makefile.in aclocal.m4 configure configure.ac 
	ltmain.sh 
Log Message:
Add LDAPI


Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.am	22 Feb 2007 23:59:13 -0000	1.30
+++ Makefile.am	27 Feb 2007 02:57:24 -0000	1.31
@@ -880,6 +880,10 @@
 #------------------------
 # ns-slapd
 #------------------------
+if enable_ldapi
+        GETSOCKETPEER=ldap/servers/slapd/getsocketpeer.c
+endif
+
 ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
 	ldap/servers/slapd/auth.c \
 	ldap/servers/slapd/bind.c  \
@@ -912,7 +916,8 @@
 	ldap/servers/slapd/strdup.c \
 	ldap/servers/slapd/stubs.c \
 	ldap/servers/slapd/tempnam.c  \
-	ldap/servers/slapd/unbind.c
+	ldap/servers/slapd/unbind.c \
+	$(GETSOCKETPEER)
 
 ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) @sasl_inc@ @ldapsdk_inc@ @nss_inc@ \
 	@nspr_inc@ @svrcore_inc@


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile.in	23 Feb 2007 19:40:52 -0000	1.35
+++ Makefile.in	27 Feb 2007 02:57:24 -0000	1.36
@@ -628,6 +628,26 @@
 mmldif_bin_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__ns_slapd_SOURCES_DIST = ldap/servers/slapd/abandon.c \
+	ldap/servers/slapd/auth.c ldap/servers/slapd/bind.c \
+	ldap/servers/slapd/compare.c ldap/servers/slapd/config.c \
+	ldap/servers/slapd/configdse.c ldap/servers/slapd/connection.c \
+	ldap/servers/slapd/conntable.c ldap/servers/slapd/daemon.c \
+	ldap/servers/slapd/detach.c ldap/servers/slapd/extendop.c \
+	ldap/servers/slapd/fedse.c ldap/servers/slapd/fileio.c \
+	ldap/servers/slapd/getopt_ext.c ldap/servers/slapd/globals.c \
+	ldap/servers/slapd/house.c ldap/servers/slapd/init.c \
+	ldap/servers/slapd/lite_entries.c ldap/servers/slapd/main.c \
+	ldap/servers/slapd/monitor.c ldap/servers/slapd/passwd_extop.c \
+	ldap/servers/slapd/protect_db.c ldap/servers/slapd/psearch.c \
+	ldap/servers/slapd/pw_mgmt.c ldap/servers/slapd/rootdse.c \
+	ldap/servers/slapd/sasl_io.c ldap/servers/slapd/saslbind.c \
+	ldap/servers/slapd/search.c \
+	ldap/servers/slapd/start_tls_extop.c \
+	ldap/servers/slapd/strdup.c ldap/servers/slapd/stubs.c \
+	ldap/servers/slapd/tempnam.c ldap/servers/slapd/unbind.c \
+	ldap/servers/slapd/getsocketpeer.c
+ at enable_ldapi_TRUE@am__objects_4 = ldap/servers/slapd/ns_slapd-getsocketpeer.$(OBJEXT)
 am_ns_slapd_OBJECTS = ldap/servers/slapd/ns_slapd-abandon.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-auth.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-bind.$(OBJEXT) \
@@ -660,7 +680,7 @@
 	ldap/servers/slapd/ns_slapd-strdup.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-stubs.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-tempnam.$(OBJEXT) \
-	ldap/servers/slapd/ns_slapd-unbind.$(OBJEXT)
+	ldap/servers/slapd/ns_slapd-unbind.$(OBJEXT) $(am__objects_4)
 ns_slapd_OBJECTS = $(am_ns_slapd_OBJECTS)
 ns_slapd_DEPENDENCIES = libslapd.la libldaputil.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -752,7 +772,7 @@
 	$(ldap_agent_bin_SOURCES) $(am__ldclt_bin_SOURCES_DIST) \
 	$(ldif_bin_SOURCES) $(makstrdb_SOURCES) \
 	$(migratecred_bin_SOURCES) $(mmldif_bin_SOURCES) \
-	$(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) \
+	$(am__ns_slapd_SOURCES_DIST) $(pwdhash_bin_SOURCES) \
 	$(rsearch_bin_SOURCES)
 configDATA_INSTALL = $(INSTALL_DATA)
 nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
@@ -837,7 +857,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -882,6 +901,8 @@
 debug_defs = @debug_defs@
 enable_dna_FALSE = @enable_dna_FALSE@
 enable_dna_TRUE = @enable_dna_TRUE@
+enable_ldapi_FALSE = @enable_ldapi_FALSE@
+enable_ldapi_TRUE = @enable_ldapi_TRUE@
 enable_pam_passthru_FALSE = @enable_pam_passthru_FALSE@
 enable_pam_passthru_TRUE = @enable_pam_passthru_TRUE@
 exec_prefix = @exec_prefix@
@@ -1749,6 +1770,7 @@
 #------------------------
 # ns-slapd
 #------------------------
+ at enable_ldapi_TRUE@GETSOCKETPEER = ldap/servers/slapd/getsocketpeer.c
 ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
 	ldap/servers/slapd/auth.c \
 	ldap/servers/slapd/bind.c  \
@@ -1781,7 +1803,8 @@
 	ldap/servers/slapd/strdup.c \
 	ldap/servers/slapd/stubs.c \
 	ldap/servers/slapd/tempnam.c  \
-	ldap/servers/slapd/unbind.c
+	ldap/servers/slapd/unbind.c \
+	$(GETSOCKETPEER)
 
 ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) @sasl_inc@ @ldapsdk_inc@ @nss_inc@ \
 	@nspr_inc@ @svrcore_inc@
@@ -3628,6 +3651,9 @@
 ldap/servers/slapd/ns_slapd-unbind.$(OBJEXT):  \
 	ldap/servers/slapd/$(am__dirstamp) \
 	ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp)
+ldap/servers/slapd/ns_slapd-getsocketpeer.$(OBJEXT):  \
+	ldap/servers/slapd/$(am__dirstamp) \
+	ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp)
 ns-slapd$(EXEEXT): $(ns_slapd_OBJECTS) $(ns_slapd_DEPENDENCIES) 
 	@rm -f ns-slapd$(EXEEXT)
 	$(ns_slapd_LINK) $(ns_slapd_LDFLAGS) $(ns_slapd_OBJECTS) $(ns_slapd_LDADD) $(LIBS)
@@ -4342,6 +4368,7 @@
 	-rm -f ldap/servers/slapd/ns_slapd-fedse.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-fileio.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-getopt_ext.$(OBJEXT)
+	-rm -f ldap/servers/slapd/ns_slapd-getsocketpeer.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-globals.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-house.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-init.$(OBJEXT)
@@ -4792,6 +4819,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/ns_slapd-fedse.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/ns_slapd-fileio.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/ns_slapd-getopt_ext.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/ns_slapd-getsocketpeer.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/ns_slapd-globals.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/ns_slapd-house.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/slapd/$(DEPDIR)/ns_slapd-init.Po at am__quote@
@@ -8241,6 +8269,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/ns_slapd-unbind.obj `if test -f 'ldap/servers/slapd/unbind.c'; then $(CYGPATH_W) 'ldap/servers/slapd/unbind.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/unbind.c'; fi`
 
+ldap/servers/slapd/ns_slapd-getsocketpeer.o: ldap/servers/slapd/getsocketpeer.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/ns_slapd-getsocketpeer.o -MD -MP -MF "ldap/servers/slapd/$(DEPDIR)/ns_slapd-getsocketpeer.Tpo" -c -o ldap/servers/slapd/ns_slapd-getsocketpeer.o `test -f 'ldap/servers/slapd/getsocketpeer.c' || echo '$(srcdir)/'`ldap/servers/slapd/getsocketpeer.c; \
+ at am__fastdepCC_TRUE@	then mv -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-getsocketpeer.Tpo" "ldap/servers/slapd/$(DEPDIR)/ns_slapd-getsocketpeer.Po"; else rm -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-getsocketpeer.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/slapd/getsocketpeer.c' object='ldap/servers/slapd/ns_slapd-getsocketpeer.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/ns_slapd-getsocketpeer.o `test -f 'ldap/servers/slapd/getsocketpeer.c' || echo '$(srcdir)/'`ldap/servers/slapd/getsocketpeer.c
+
+ldap/servers/slapd/ns_slapd-getsocketpeer.obj: ldap/servers/slapd/getsocketpeer.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/ns_slapd-getsocketpeer.obj -MD -MP -MF "ldap/servers/slapd/$(DEPDIR)/ns_slapd-getsocketpeer.Tpo" -c -o ldap/servers/slapd/ns_slapd-getsocketpeer.obj `if test -f 'ldap/servers/slapd/getsocketpeer.c'; then $(CYGPATH_W) 'ldap/servers/slapd/getsocketpeer.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/getsocketpeer.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-getsocketpeer.Tpo" "ldap/servers/slapd/$(DEPDIR)/ns_slapd-getsocketpeer.Po"; else rm -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-getsocketpeer.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/slapd/getsocketpeer.c' object='ldap/servers/slapd/ns_slapd-getsocketpeer.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/ns_slapd-getsocketpeer.obj `if test -f 'ldap/servers/slapd/getsocketpeer.c'; then $(CYGPATH_W) 'ldap/servers/slapd/getsocketpeer.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/getsocketpeer.c'; fi`
+
 ldap/servers/slapd/tools/pwdhash_bin-pwenc.o: ldap/servers/slapd/tools/pwenc.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pwdhash_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/tools/pwdhash_bin-pwenc.o -MD -MP -MF "ldap/servers/slapd/tools/$(DEPDIR)/pwdhash_bin-pwenc.Tpo" -c -o ldap/servers/slapd/tools/pwdhash_bin-pwenc.o `test -f 'ldap/servers/slapd/tools/pwenc.c' || echo '$(srcdir)/'`ldap/servers/slapd/tools/pwenc.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/slapd/tools/$(DEPDIR)/pwdhash_bin-pwenc.Tpo" "ldap/servers/slapd/tools/$(DEPDIR)/pwdhash_bin-pwenc.Po"; else rm -f "ldap/servers/slapd/tools/$(DEPDIR)/pwdhash_bin-pwenc.Tpo"; exit 1; fi


Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- aclocal.m4	23 Feb 2007 19:40:51 -0000	1.23
+++ aclocal.m4	27 Feb 2007 02:57:24 -0000	1.24
@@ -1597,7 +1597,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -4305,9 +4305,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$_LT_AC_TAGVAR(GCC, $1)
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -4441,11 +4438,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -4457,7 +4454,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -4537,7 +4534,7 @@
 link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6373,7 +6370,6 @@
     done
   done
 done
-IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6406,7 +6402,6 @@
 done
 ])
 SED=$lt_cv_path_SED
-AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 


Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- configure	23 Feb 2007 19:40:52 -0000	1.32
+++ configure	27 Feb 2007 02:57:24 -0000	1.33
@@ -465,7 +465,7 @@
 #endif"
 
 ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
 XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3832,7 +3832,6 @@
     done
   done
 done
-IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3867,7 +3866,6 @@
 fi
 
 SED=$lt_cv_path_SED
-
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -4308,7 +4306,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4311 "configure"' > conftest.$ac_ext
+  echo '#line 4309 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5443,7 +5441,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5446:" \
+echo "$as_me:5444:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6506,11 +6504,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6509: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6507: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6513: \$? = $ac_status" >&5
+   echo "$as_me:6511: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6774,11 +6772,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6777: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6775: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6781: \$? = $ac_status" >&5
+   echo "$as_me:6779: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6878,11 +6876,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6881: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6879: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6885: \$? = $ac_status" >&5
+   echo "$as_me:6883: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8347,7 +8345,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 8350 "configure"' > conftest.$ac_ext
+    echo '#line 8348 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8366,7 +8364,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -9244,7 +9242,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9247 "configure"
+#line 9245 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9344,7 +9342,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9347 "configure"
+#line 9345 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9675,9 +9673,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -9811,11 +9806,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -9827,7 +9822,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -9907,7 +9902,7 @@
 link_all_deplibs=$link_all_deplibs
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -11687,11 +11682,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11690: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11685: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11694: \$? = $ac_status" >&5
+   echo "$as_me:11689: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11791,11 +11786,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11794: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11789: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11798: \$? = $ac_status" >&5
+   echo "$as_me:11793: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12327,7 +12322,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 12330 "configure"' > conftest.$ac_ext
+    echo '#line 12325 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -12346,7 +12341,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -12731,9 +12726,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_CXX
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -12867,11 +12859,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_CXX
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_CXX
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -12883,7 +12875,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -12963,7 +12955,7 @@
 link_all_deplibs=$link_all_deplibs_CXX
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13385,11 +13377,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13388: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13380: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13392: \$? = $ac_status" >&5
+   echo "$as_me:13384: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13489,11 +13481,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13492: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13484: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13496: \$? = $ac_status" >&5
+   echo "$as_me:13488: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14938,7 +14930,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 14941 "configure"' > conftest.$ac_ext
+    echo '#line 14933 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -14957,7 +14949,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -15342,9 +15334,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_F77
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -15478,11 +15467,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_F77
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_F77
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -15494,7 +15483,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -15574,7 +15563,7 @@
 link_all_deplibs=$link_all_deplibs_F77
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15716,11 +15705,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15719: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15708: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15723: \$? = $ac_status" >&5
+   echo "$as_me:15712: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15984,11 +15973,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15987: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15976: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15991: \$? = $ac_status" >&5
+   echo "$as_me:15980: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16088,11 +16077,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16091: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16080: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16095: \$? = $ac_status" >&5
+   echo "$as_me:16084: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17557,7 +17546,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17560 "configure"' > conftest.$ac_ext
+    echo '#line 17549 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -17576,7 +17565,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi
 
@@ -17961,9 +17950,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_GCJ
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18097,11 +18083,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_GCJ
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_GCJ
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18113,7 +18099,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18193,7 +18179,7 @@
 link_all_deplibs=$link_all_deplibs_GCJ
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18445,9 +18431,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
 
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -18581,11 +18564,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18597,7 +18580,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18677,7 +18660,7 @@
 link_all_deplibs=$link_all_deplibs_RC
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23005,6 +22988,16 @@
 echo "${ECHO_T}no" >&6
 fi
 
+
+if test "$enable_ldapi" = "yes"; then
+  enable_ldapi_TRUE=
+  enable_ldapi_FALSE='#'
+else
+  enable_ldapi_TRUE='#'
+  enable_ldapi_FALSE=
+fi
+
+
 # the default prefix - override with --prefix or --with-fhs
 
 
@@ -25218,6 +25211,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${enable_ldapi_TRUE}" && test -z "${enable_ldapi_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"enable_ldapi\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"enable_ldapi\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${WINNT_TRUE}" && test -z "${WINNT_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"WINNT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -25826,7 +25826,6 @@
 s, at CCDEPMODE@,$CCDEPMODE,;t t
 s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at SED@,$SED,;t t
 s, at EGREP@,$EGREP,;t t
 s, at LN_S@,$LN_S,;t t
 s, at ECHO@,$ECHO,;t t
@@ -25848,6 +25847,8 @@
 s, at enable_pam_passthru_FALSE@,$enable_pam_passthru_FALSE,;t t
 s, at enable_dna_TRUE@,$enable_dna_TRUE,;t t
 s, at enable_dna_FALSE@,$enable_dna_FALSE,;t t
+s, at enable_ldapi_TRUE@,$enable_ldapi_TRUE,;t t
+s, at enable_ldapi_FALSE@,$enable_ldapi_FALSE,;t t
 s, at configdir@,$configdir,;t t
 s, at sampledatadir@,$sampledatadir,;t t
 s, at propertydir@,$propertydir,;t t


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- configure.ac	23 Feb 2007 19:40:51 -0000	1.23
+++ configure.ac	27 Feb 2007 02:57:24 -0000	1.24
@@ -119,6 +119,7 @@
 else
   AC_MSG_RESULT(no)
 fi
+AM_CONDITIONAL(enable_ldapi,test "$enable_ldapi" = "yes")
 
 # the default prefix - override with --prefix or --with-fhs
 AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ltmain.sh	21 Feb 2007 17:44:13 -0000	1.11
+++ ltmain.sh	27 Feb 2007 02:57:24 -0000	1.12
@@ -46,16 +46,10 @@
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" ; then
   setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -111,14 +105,12 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-         save_$lt_var=\$$lt_var
-         $lt_var=C
-         export $lt_var
-       fi"
-done
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -144,8 +136,6 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -337,17 +327,7 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-       *" $my_xlib_u "*)
-         extracted_serial=`expr $extracted_serial + 1`
-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
-       *) break ;;
-       esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -778,7 +758,6 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
-    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1159,9 +1138,8 @@
     for arg
     do
       case $arg in
-      -all-static | -static | -static-libtool-libs)
-    case $arg in
-    -all-static)
+      -all-static | -static)
+	if test "X$arg" = "X-all-static"; then
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1169,20 +1147,12 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	  ;;
-    -static)
+	else
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	  ;;
-    -static-libtool-libs)
-      if test -z "$pic_flag" && test -n "$link_static_flag"; then
-        dlopen_self=$dlopen_self_static
-      fi
-      prefer_static_libs=yes
-      ;;
-    esac
+	fi
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1742,7 +1712,7 @@
 	continue
 	;;
 
-      -static | -static-libtool-libs)
+      -static)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2520,9 +2490,7 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-         { { test "$prefer_static_libs" = no ||
-             test "$prefer_static_libs,$installed" = "built,yes"; } ||
-           test -z "$old_library"; }; then
+	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3218,7 +3186,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows|none)
+	  darwin|linux|osf|windows)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3442,11 +3410,11 @@
       fi
 
       # Eliminate all temporary directories.
-#      for path in $notinst_path; do
-#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-#      done
+      for path in $notinst_path; do
+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3547,12 +3515,13 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+	  if test "$?" -eq 0 ; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
+              if test "$name" != "" && test "$name" -ne "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3591,7 +3560,9 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		$LTCC $LTCFLAGS -o conftest conftest.c $i
+		# Did it work?
+		if test "$?" -eq 0 ; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3623,7 +3594,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
+		  $echo "***  make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4268,14 +4239,12 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
+      # -Wl from whole_archive_flag_spec
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4723,16 +4692,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
             else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
             ;;
           esac
 	  ;;
@@ -4747,13 +4716,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4840,7 +4809,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4877,7 +4846,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi
 
       # Quote $echo for shipping.
@@ -5284,18 +5253,6 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5438,7 +5395,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5624,7 +5581,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5969,9 +5926,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6180,7 +6137,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6456,15 +6413,12 @@
       fi
 
       # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-       eval "if test \"\${save_$lt_var+set}\" = set; then
-               $lt_var=\$save_$lt_var; export $lt_var
-             else
-               $lt_unset $lt_var
-             fi"
-      done
-
+      if test "${save_LC_ALL+set}" = set; then
+	LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+	LANG="$save_LANG"; export LANG
+      fi
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6821,9 +6775,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
+		    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
+		    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6837,11 +6791,9 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
+		    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 



From fedora-directory-commits at redhat.com  Tue Feb 27 03:15:05 2007
From: fedora-directory-commits at redhat.com (Pete Rowley (prowley))
Date: Mon, 26 Feb 2007 22:15:05 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd
	getsocketpeer.c, 1.1, 1.2 getsocketpeer.h, 1.1, 1.2
Message-ID: <200702270315.l1R3F5cI020378@cvs-int.fedora.redhat.com>

Author: prowley

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20355

Modified Files:
	getsocketpeer.c getsocketpeer.h 
Log Message:
corrected copyright statement


Index: getsocketpeer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/getsocketpeer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- getsocketpeer.c	27 Feb 2007 02:57:30 -0000	1.1
+++ getsocketpeer.c	27 Feb 2007 03:15:03 -0000	1.2
@@ -25,7 +25,6 @@
  * exception.
  *
  *
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/


Index: getsocketpeer.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/getsocketpeer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- getsocketpeer.h	27 Feb 2007 02:57:30 -0000	1.1
+++ getsocketpeer.h	27 Feb 2007 03:15:03 -0000	1.2
@@ -25,7 +25,6 @@
  * exception.
  *
  *
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/



From fedora-directory-commits at redhat.com  Tue Feb 27 20:16:10 2007
From: fedora-directory-commits at redhat.com (Pete Rowley (prowley))
Date: Tue, 27 Feb 2007 15:16:10 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd
	getsocketpeer.c, 1.2, 1.3
Message-ID: <200702272016.l1RKGALP017929@cvs-int.fedora.redhat.com>

Author: prowley

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17913

Modified Files:
	getsocketpeer.c 
Log Message:
fix defined out code to really be defined out


Index: getsocketpeer.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/getsocketpeer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- getsocketpeer.c	27 Feb 2007 03:15:03 -0000	1.2
+++ getsocketpeer.c	27 Feb 2007 20:16:08 -0000	1.3
@@ -100,7 +100,7 @@
 	if(0 == getpeereid(fd, &uid, &gid))
 		ret = 0;
 
-#else 0 /* hpux / some BSDs - file descriptor cooperative auth */
+#elif 0 /* hpux / some BSDs - file descriptor cooperative auth */
 
         struct msghdr msg;
 	struct iovec iov;



From fedora-directory-commits at redhat.com  Wed Feb 28 19:05:33 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 28 Feb 2007 14:05:33 -0500
Subject: [Fedora-directory-commits] 
	esc/src/app/xul/esc/components escCLH.js, 1.2, 1.3
Message-ID: <200702281905.l1SJ5XPJ009390@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/components
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9374

Modified Files:
	escCLH.js 
Log Message:
Add support for simple -usage command which prints out command line usage.



Index: escCLH.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/components/escCLH.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- escCLH.js	9 Feb 2007 21:55:31 -0000	1.2
+++ escCLH.js	28 Feb 2007 19:05:30 -0000	1.3
@@ -57,10 +57,23 @@
                cmdLine.preventDefault = true;
            }
 
+
+           var showUsage = cmdLine.handleFlag("usage",false);
+
+           recordMessage("ShowUsage flag: " + showUsage);
+           if(showUsage) {
+               cmdLine.preventDefault = true;
+           }
+
            if(win)
            {
                recordMessage("Subsequent command invocation. Launch appropriate  page.");
-
+               if(showUsage) 
+               {
+                   recordMessage("About to show usage.");
+                   win.ShowUsage();
+                   return;
+               }
                var locName = win.location.toString();
 
                recordMessage("Base window . " + locName);



From fedora-directory-commits at redhat.com  Wed Feb 28 19:08:45 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 28 Feb 2007 14:08:45 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
	ESC.js, 1.7, 1.8
Message-ID: <200702281908.l1SJ8jhs009432@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9414

Modified Files:
	ESC.js 
Log Message:
Simple fixes for Security Officer Mode.



Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ESC.js	24 Feb 2007 02:07:49 -0000	1.7
+++ ESC.js	28 Feb 2007 19:08:43 -0000	1.8
@@ -288,9 +288,13 @@
       homeRes =  phoneHome(home,keyID,callback);
   }
 
-  if(!home)
+  // Launch the config dialog only if we can't
+  // Phone Home and we are not in the special security mode
+
+  if(!homeRes && !CheckForSecurityMode())
   {
       recordMessage("About to launch CONFIG , non secmode...");
+
       launchCONFIG(keyType,keyID);
   }
 
@@ -2705,7 +2709,8 @@
 
   UpdateInfoForKeyID(keyType, keyID, keyStatus, keyReqAuth, keyIsAuthed);
 
-  MyAlert(getBundleString("enrollmentFor") + " "  + getBundleString("smartCard") + " " + getBundleString("wasSuccessful"));
+  if(!CheckForSecurityMode())
+      MyAlert(getBundleString("enrollmentFor") + " "  + getBundleString("smartCard") + " " + getBundleString("wasSuccessful"));
 
 
   if(gEnrollmentPage)
@@ -2732,7 +2737,8 @@
 
   UpdateInfoForKeyID(keyType, keyID, keyStatus, keyReqAuth, keyIsAuthed);
 
-  MyAlert(getBundleString("pinResetSuccessful"));
+  if(!CheckForSecurityMode())
+      MyAlert(getBundleString("pinResetSuccessful"));
   ClearProgressBar(KeyToProgressBarID(keyType, keyID));
 
   if(gAdminPage)
@@ -2754,7 +2760,8 @@
 
   UpdateInfoForKeyID(keyType, keyID, keyStatus, keyReqAuth, keyIsAuthed);
 
-  MyAlert(getBundleString("formatOf") + " " + getBundleString("smartCard") + " "  + getBundleString("wasSuccessful"));
+  if(!CheckForSecurityMode())
+      MyAlert(getBundleString("formatOf") + " " + getBundleString("smartCard") + " "  + getBundleString("wasSuccessful"));
   ClearProgressBar(KeyToProgressBarID(keyType, keyID));
 
    if(gAdminPage)
@@ -2809,7 +2816,8 @@
      UpdateAdminListRow(keyType,keyID);
    }
 
-  MyAlert(typeStr);
+  if(!CheckForSecurityMode())
+      MyAlert(typeStr);
   ClearProgressBar(KeyToProgressBarID(keyType, keyID));
 }
 
@@ -3357,6 +3365,18 @@
 
 }
 
+function ShowUsage()
+{
+    var usageStr = getBundleString("escUsage1")  + "\n";
+    usageStr += getBundleString("escUsage2") + "\n";
+    usageStr += getBundleString("escUsage3") + "\n";
+    usageStr += getBundleString("escUsage4") + "\n";
+    usageStr += getBundleString("escUsage5"); 
+
+    MyAlert(usageStr);
+}
+
+
 //Is the security mode up?
 function CheckForSecurityMode()
 {
@@ -3435,31 +3455,12 @@
 
 }
 
+
 //Launch security mode window
 
 function launchESCSecMode(aUrl)
 {
     recordMessage("In launchESCSecMode");
-    var noEnrolledKeys = true;
-    var arr = GetAvailableCoolKeys();
-    if (arr && arr.length > 0)
-    {
-       var i;
-       for (i=0; i < 1; i++)
-       {
-          if(GetCoolKeyIsEnrolled(arr[i][0],arr[i][1]))
-          {
-               noEnrolledKeys = false;
-               break;
-          }
-       }
-    } 
-
-    if(noEnrolledKeys)
-    {
-        MyAlert(getBundleString("errorNeedKeyForSecMode"));
-        return;
-    }
 
     DoCoolKeySetConfigValue(ESC_SECURITY_URL,aUrl);
 
@@ -3468,8 +3469,6 @@
     {
         recordMessage("About to launch security window.");
         var wind = window.open("chrome://esc/content/security.xul","","chrome,resizable,centerscreen,dialog");
-
-         wind.ShowWindow();
          wind.focus();
     }
     else



From fedora-directory-commits at redhat.com  Wed Feb 28 19:13:55 2007
From: fedora-directory-commits at redhat.com (Jack Magne (jmagne))
Date: Wed, 28 Feb 2007 14:13:55 -0500
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/locale/en-US
	esc.properties, 1.4, 1.5
Message-ID: <200702281913.l1SJDtFB009565@cvs-int.fedora.redhat.com>

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9547

Modified Files:
	esc.properties 
Log Message:
Add some entries for the -usage command line switch display.



Index: esc.properties
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/locale/en-US/esc.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- esc.properties	9 Feb 2007 21:54:22 -0000	1.4
+++ esc.properties	28 Feb 2007 19:13:52 -0000	1.5
@@ -180,6 +180,13 @@
 cancelled=cancelled.
 errorFindESCPlatform=Unable to determine Smart Card Manager platform.
 errorIssuerInfo=Error obtaining Issuer Info for key.
+
+escUsage1=Usage:    
+escUsage2=esc
+escUsage3=esc -secmode SECURITY_URL
+escUsage4=Ex: esc -secmode http://test.host.com
+escUsage5=esc -usage
+
 #Strings for TRAY.j
 errorTrayIsInitialized=Can't determine if Icon component is already intialized!
 errorShowAllWindows=Error Showing All Windows:



From fedora-directory-commits at redhat.com  Wed Feb 28 23:05:46 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 28 Feb 2007 18:05:46 -0500
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/servers/slapd/tools/rsearch/scripts dbgen.pl,
	1.1, 1.2
Message-ID: <200702282305.l1SN5kF4028152@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28116/ldap/servers/slapd/tools/rsearch/scripts

Modified Files:
	dbgen.pl 
Log Message:
Resolves: 230458
Summary: Corrected out of date licensing/copyright block in a few files.



Index: dbgen.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbgen.pl	6 Jan 2006 00:53:29 -0000	1.1
+++ dbgen.pl	28 Feb 2007 23:05:39 -0000	1.2
@@ -1,8 +1,42 @@
 #!/usr/bin/perl
+# BEGIN COPYRIGHT BLOCK
+# 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; version 2 of the License.
+# 
+# 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., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+# 
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
+# 
+# 
+# Copyright (C) 2007 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
 
 #------------------------------------------------------------------------
-## Copyright 1997 - Netscape Communications Corporation
-##
 ## NAME
 ##  dbgen
 ##



From fedora-directory-commits at redhat.com  Wed Feb 28 23:05:41 2007
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 28 Feb 2007 18:05:41 -0500
Subject: [Fedora-directory-commits] 
	ldapserver/ldap/docs/dirhlp Makefile, 1.4,
	1.5 index.map, 1.1.1.1, 1.2 tokens.map, 1.2, 1.3
Message-ID: <200702282306.l1SN6BuI028156@cvs-int.fedora.redhat.com>

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/docs/dirhlp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28116/ldap/docs/dirhlp

Modified Files:
	Makefile index.map tokens.map 
Log Message:
Resolves: 230458
Summary: Corrected out of date licensing/copyright block in a few files.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/docs/dirhlp/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	5 Apr 2005 00:57:43 -0000	1.4
+++ Makefile	28 Feb 2007 23:05:38 -0000	1.5
@@ -1,10 +1,41 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms.
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2002-2003 Netscape Communications Corporation.
+# BEGIN COPYRIGHT BLOCK
+# 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; version 2 of the License.
+# 
+# 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., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+# 
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
+# 
+# 
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2007 Red Hat, Inc.
 # All rights reserved.
-#
+# END COPYRIGHT BLOCK
+
 # 
 # GNU Makefile for Directory Server Console Help 
 #


Index: index.map
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/docs/dirhlp/index.map,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.map	21 Jan 2005 00:40:49 -0000	1.1.1.1
+++ index.map	28 Feb 2007 23:05:38 -0000	1.2
@@ -1,149 +1,180 @@
-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-; license terms. Copyright 2001 Sun Microsystems, Inc. 
-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
-; All rights reserved. 
-;
-;----------------------------------------------------------------------
-; Last update: 22 October 2001 by Tech Pubs
-;-------------------------------------------MAPPINGS
-; UI Reference Token = help/filename.htm
-;-------------------------------------------PROGRAMS
-;
-;MENU BAR
-;
-;Help Menu from all tabs
-tasks-menubar-help = ag/contents.htm
-preferences-confirmation-help = help/confirmation_preferences.htm
-
-;TASKS TAB
-tasks-backup-help = help/backup.htm
-tasks-restore-help = help/restore.htm
-
-
-;CONFIGURATION TAB
-;Root Node
-configuration-system-settings-help = help/settings.htm
-configuration-system-performance-help = help/performance.htm
-configuration-system-encryption-help = help/encryption.htm
-configuration-system-encryption-preferences-dbox-help = help/encryption_pref.htm
-configuration-system-snmp-help = help/snmp.htm
-configuration-system-manager-help = help/manager.htm
-
-;Database Icon
-configuration-database-indexes-help = help/indexes.htm
-configuration-database-passwords-help = help/passwords.htm
-configuration-database-accountlockout-help = help/account_lockout.htm
-configuration-database-indexes-add-dbox-help = help/index_attribute.htm
-configuration-database-settings-help = help/ldbm_instance_settings.htm
-configuration-database-import-ldap-dbox-help = help/import_ldap.htm
-configuration-database-import-fastwire-dbox-help = help/import_fastwire.htm
-configuration-database-initialize-backend-dbox-help = help/initialize_backend.htm
-configuration-database-export-dbox-help = help/export_general.htm
-configuration-database-export-single-dbox-help = help/export_single.htm
-configuration-database-plugin-setting-help = help/ldbm_plugin_settings.htm
-configuration-database-default-indexes-help = help/default_indexes.htm
-
-;Chaining Database Icon
-configuration-new-chaining-instance-dbox-help = help/new_chaining_be.htm
-configuration-chaining-settings-help = help/chaining_settings.htm
-configuration-chaining-settings-ctrl-chooser-dbox-help = help/chaining_controls.htm
-configuration-chaining-settings-comp-chooser-dbox-help = help/chaining_components.htm
-configuration-chaining-default-help = help/chaining_default.htm
-configuration-chaining-connection-help = help/chaining_connection.htm
-configuration-chaining-authentication-help = help/chaining_authentication.htm
-
-;LDBM Database Instance Icon
-configuration-new-ldbm-instance-dbox-help =  help/new_ldbm_instance.htm
-
-;Mapping Tree
-configuration-mapping-settings-help = help/mapping_node_settings.htm
-configuration-mapping-add-backend-dbox-help = help/mapping_backend_add.htm
-configuration-mapping-database-help = help/mapping_database.htm
-configuration-mapping-referral-help = help/mapping_referrals.htm
-configuration-new-mapping-node-dbox-help = help/new_mapping_node.htm
-
-
-;Schema Icon
-configuration-schema-objclass-help = help/object_classes.htm
-configuration-schema-objclass-create-dbox-help = help/create_objclass.htm
-configuration-schema-attr-help = help/attributes.htm
-configuration-schema-attr-create-dbox-help = help/create_attributes.htm
-configuration-schema-mrule-help = help/matching_rules.htm
-
-;Replication Agreements Icon
-configuration-replication-legacyconsumersettings-help = help/legacy_consumer_settings.htm
-configuration-replication-suppliersettings-help = help/supplier_settings.htm
-configuration-replication-replicasettings-help = help/replica_settings.htm
-configuration-replication-summary-help = help/rep_summary.htm
-configuration-replication-schedule-help = help/schedule_rep.htm
-configuration-replication-content-help = help/rep_content.htm
-configuration-replication-host-dbox-help = help/consumer_server_info.htm
-
-;Logs Icon
-configuration-logs-access-help = help/access_log.htm
-configuration-logs-error-help = help/error_log.htm
-configuration-logs-audit-help = help/audit_log.htm
-
-;Plugins Icons
-configuration-plugins-help = help/plugins.htm
-
-
-;REPLICATION AGREEMENT WIZARD
-replication-wizard-content-help = help/rep_source_destination.htm
-replication-wizard-schedule-help = help/schedule_rep_wiz.htm
-replication-wizard-consumerinit-help = help/consumer_init.htm
-replication-wizard-summary-help = help/summary_wiz.htm
-replication-wizard-legacyrmmrname-help = help/rep_agreement_name.htm
-replication-wizard-cirsirselect-help = help/rep_select_wiz.htm
-replication-wizard-cirsirname-help = help/rep_name_wiz.htm
-replication-wizard-attribute-help = help/rep_attributes_wiz.htm
-
-
-;DIRECTORY TAB
-;Role Configuration
-configuration-role-member-filtered-help = help/new_filtered_member.htm
-configuration-role-member-managed-help = help/new_managed_member.htm
-configuration-role-member-nested-help = help/new_nested_member.htm
-configuration-role-account-help = help/role_accounts.htm
-configuration-role-info-help = help/create_new_role.htm
-configuration-set-role = help/set_role.htm
-configuration-choose-role = help/role_selector.htm
-
-;CoS Configuration
-configuration-cos-attributes-help = help/cos_attributes.htm
-configuration-cos-info-help = help/cos_info.htm
-configuration-cos-template-help = help/cos_template.htm
-
-;STATUS TAB
-;Replication Icon
-status-replication-help = help/replication_status.htm
-
-;Logs Icon
-status-logs-access-help = help/access_log_status.htm
-status-logs-error-help = help/error_log_status.htm
-status-logs-audit-help = help/audit_log_status.htm
-
-;Performance Counters Icon
-status-perfcounters-server-help = help/server_performance.htm
-status-perfcounters-database-help = help/database_performance.htm
-
-
-;PROPERTY EDITOR WINDOWS
-property-main-help = help/property_editor.htm
-property-new-objectclass-dbox-help = help/add_new_objclass.htm
-property-new-attribute-dbox-help = help/add_new_attribute.htm
-
-;LDAP URL Construction Dialog
-configuration-construct-new-url-dbox-help = help/construct_ldap_url.htm
-
-;Account Inactivation in Entry Edit Dialog
-configuration-user-account-help = help/
-
-;VERY ADVANCED SEARCH DIALOG BOX
-search-dbox-veryadvanced-help = help/advanced_search.htm
-
-;INSTALL
-menubar-newinstance-dbox-help = help/new_server_instance.htm
-
-; SUBTREE SELECTION DIALOG BOX
-subtree-selection-dbox-help = help/directory_browser.htm
+; --- BEGIN COPYRIGHT BLOCK ---
+; 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; version 2 of the License.
+; 
+; 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., 59 Temple
+; Place, Suite 330, Boston, MA 02111-1307 USA.
+; 
+; In addition, as a special exception, Red Hat, Inc. gives You the additional
+; right to link the code of this Program with code not covered under the GNU
+; General Public License ("Non-GPL Code") and to distribute linked combinations
+; including the two, subject to the limitations in this paragraph. Non-GPL Code
+; permitted under this exception must only link to the code of this Program
+; through those well defined interfaces identified in the file named EXCEPTION
+; found in the source code files (the "Approved Interfaces"). The files of
+; Non-GPL Code may instantiate templates or use macros or inline functions from
+; the Approved Interfaces without causing the resulting work to be covered by
+; the GNU General Public License. Only Red Hat, Inc. may make changes or
+; additions to the list of Approved Interfaces. You must obey the GNU General
+; Public License in all respects for all of the Program code and other code used
+; in conjunction with the Program except the Non-GPL Code covered by this
+; exception. If you modify this file, you may extend this exception to your
+; version of the file, but you are not obligated to do so. If you do not wish to
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception. 
+; 
+; 
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2007 Red Hat, Inc.
+; All rights reserved.
+; --- END COPYRIGHT BLOCK ---
+
+;-------------------------------------------MAPPINGS
+; UI Reference Token = help/filename.htm
+;-------------------------------------------PROGRAMS
+;
+;MENU BAR
+;
+;Help Menu from all tabs
+tasks-menubar-help = ag/contents.htm
+preferences-confirmation-help = help/confirmation_preferences.htm
+
+;TASKS TAB
+tasks-backup-help = help/backup.htm
+tasks-restore-help = help/restore.htm
+
+
+;CONFIGURATION TAB
+;Root Node
+configuration-system-settings-help = help/settings.htm
+configuration-system-performance-help = help/performance.htm
+configuration-system-encryption-help = help/encryption.htm
+configuration-system-encryption-preferences-dbox-help = help/encryption_pref.htm
+configuration-system-snmp-help = help/snmp.htm
+configuration-system-manager-help = help/manager.htm
+
+;Database Icon
+configuration-database-indexes-help = help/indexes.htm
+configuration-database-passwords-help = help/passwords.htm
+configuration-database-accountlockout-help = help/account_lockout.htm
+configuration-database-indexes-add-dbox-help = help/index_attribute.htm
+configuration-database-settings-help = help/ldbm_instance_settings.htm
+configuration-database-import-ldap-dbox-help = help/import_ldap.htm
+configuration-database-import-fastwire-dbox-help = help/import_fastwire.htm
+configuration-database-initialize-backend-dbox-help = help/initialize_backend.htm
+configuration-database-export-dbox-help = help/export_general.htm
+configuration-database-export-single-dbox-help = help/export_single.htm
+configuration-database-plugin-setting-help = help/ldbm_plugin_settings.htm
+configuration-database-default-indexes-help = help/default_indexes.htm
+
+;Chaining Database Icon
+configuration-new-chaining-instance-dbox-help = help/new_chaining_be.htm
+configuration-chaining-settings-help = help/chaining_settings.htm
+configuration-chaining-settings-ctrl-chooser-dbox-help = help/chaining_controls.htm
+configuration-chaining-settings-comp-chooser-dbox-help = help/chaining_components.htm
+configuration-chaining-default-help = help/chaining_default.htm
+configuration-chaining-connection-help = help/chaining_connection.htm
+configuration-chaining-authentication-help = help/chaining_authentication.htm
+
+;LDBM Database Instance Icon
+configuration-new-ldbm-instance-dbox-help =  help/new_ldbm_instance.htm
+
+;Mapping Tree
+configuration-mapping-settings-help = help/mapping_node_settings.htm
+configuration-mapping-add-backend-dbox-help = help/mapping_backend_add.htm
+configuration-mapping-database-help = help/mapping_database.htm
+configuration-mapping-referral-help = help/mapping_referrals.htm
+configuration-new-mapping-node-dbox-help = help/new_mapping_node.htm
+
+
+;Schema Icon
+configuration-schema-objclass-help = help/object_classes.htm
+configuration-schema-objclass-create-dbox-help = help/create_objclass.htm
+configuration-schema-attr-help = help/attributes.htm
+configuration-schema-attr-create-dbox-help = help/create_attributes.htm
+configuration-schema-mrule-help = help/matching_rules.htm
+
+;Replication Agreements Icon
+configuration-replication-legacyconsumersettings-help = help/legacy_consumer_settings.htm
+configuration-replication-suppliersettings-help = help/supplier_settings.htm
+configuration-replication-replicasettings-help = help/replica_settings.htm
+configuration-replication-summary-help = help/rep_summary.htm
+configuration-replication-schedule-help = help/schedule_rep.htm
+configuration-replication-content-help = help/rep_content.htm
+configuration-replication-host-dbox-help = help/consumer_server_info.htm
+
+;Logs Icon
+configuration-logs-access-help = help/access_log.htm
+configuration-logs-error-help = help/error_log.htm
+configuration-logs-audit-help = help/audit_log.htm
+
+;Plugins Icons
+configuration-plugins-help = help/plugins.htm
+
+
+;REPLICATION AGREEMENT WIZARD
+replication-wizard-content-help = help/rep_source_destination.htm
+replication-wizard-schedule-help = help/schedule_rep_wiz.htm
+replication-wizard-consumerinit-help = help/consumer_init.htm
+replication-wizard-summary-help = help/summary_wiz.htm
+replication-wizard-legacyrmmrname-help = help/rep_agreement_name.htm
+replication-wizard-cirsirselect-help = help/rep_select_wiz.htm
+replication-wizard-cirsirname-help = help/rep_name_wiz.htm
+replication-wizard-attribute-help = help/rep_attributes_wiz.htm
+
+
+;DIRECTORY TAB
+;Role Configuration
+configuration-role-member-filtered-help = help/new_filtered_member.htm
+configuration-role-member-managed-help = help/new_managed_member.htm
+configuration-role-member-nested-help = help/new_nested_member.htm
+configuration-role-account-help = help/role_accounts.htm
+configuration-role-info-help = help/create_new_role.htm
+configuration-set-role = help/set_role.htm
+configuration-choose-role = help/role_selector.htm
+
+;CoS Configuration
+configuration-cos-attributes-help = help/cos_attributes.htm
+configuration-cos-info-help = help/cos_info.htm
+configuration-cos-template-help = help/cos_template.htm
+
+;STATUS TAB
+;Replication Icon
+status-replication-help = help/replication_status.htm
+
+;Logs Icon
+status-logs-access-help = help/access_log_status.htm
+status-logs-error-help = help/error_log_status.htm
+status-logs-audit-help = help/audit_log_status.htm
+
+;Performance Counters Icon
+status-perfcounters-server-help = help/server_performance.htm
+status-perfcounters-database-help = help/database_performance.htm
+
+
+;PROPERTY EDITOR WINDOWS
+property-main-help = help/property_editor.htm
+property-new-objectclass-dbox-help = help/add_new_objclass.htm
+property-new-attribute-dbox-help = help/add_new_attribute.htm
+
+;LDAP URL Construction Dialog
+configuration-construct-new-url-dbox-help = help/construct_ldap_url.htm
+
+;Account Inactivation in Entry Edit Dialog
+configuration-user-account-help = help/
+
+;VERY ADVANCED SEARCH DIALOG BOX
+search-dbox-veryadvanced-help = help/advanced_search.htm
+
+;INSTALL
+menubar-newinstance-dbox-help = help/new_server_instance.htm
+
+; SUBTREE SELECTION DIALOG BOX
+subtree-selection-dbox-help = help/directory_browser.htm


Index: tokens.map
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/docs/dirhlp/tokens.map,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tokens.map	5 Apr 2005 00:57:43 -0000	1.2
+++ tokens.map	28 Feb 2007 23:05:38 -0000	1.3
@@ -1,113 +1,143 @@
-;-------------------------------------------------------------------------
-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-; license terms. Copyright ? 2001 Sun Microsystems, Inc. 
-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
-; All rights reserved. 
-;
-;-------------------------------------------------------------------------
-; Last update: 10 July 2003 by Tech Pubs
-;-------------------------------------------MAPPINGS
-; UI Reference Token = help/filename.htm
-;-------------------------------------------PROGRAMS
-;
-;MENU BAR
-;
-;Help Menu from all tabs
-framework-menubar-contents = help/redir_agtoc.htm
-preferences-confirmation-help = help/helpmenu.htm
-framework-menubar-dochome = help/redir_dochome.htm
-
-;TASKS TAB
-tasks-backup-help = help/taskstab_bkup_restore.htm
-tasks-restore-help = help/taskstab_bkup_restore2.htm
-
-
-;CONFIGURATION TAB
-;Root Node
-configuration-system-settings-help = help/configtab_rootnode.htm
-configuration-system-performance-help = help/configtab_rootnode2.htm
-configuration-system-encryption-help = help/configtab_rootnode3.htm
-configuration-system-snmp-help = help/configtab_rootnode5.htm
-configuration-system-manager-help = help/configtab_rootnode6.htm
-configuration-system-sasl-help = help/configtab_rootnode7.htm
-configuration-system-sasl-add-dbox-help = help/configtab_rootnode8.htm
-configuration-system-sasl-mod-dbox-help = help/configtab_rootnode9.htm
-
-;Database Icon
-configuration-database-indexes-help = help/configtab_db.htm
-configuration-database-passwords-help = help/configtab_db2.htm
-configuration-database-accountlockout-help = help/configtab_db3.htm
-configuration-database-indexes-add-dbox-help = help/configtab_db4.htm
-configuration-database-settings-help = help/configtab_db5.htm
-configuration-database-import-ldap-dbox-help = help/configtab_db6.htm
-configuration-database-import-fastwire-dbox-help = help/configtab_db7.htm
-configuration-database-initialize-backend-dbox-help = help/configtab_db8.htm
-configuration-database-export-dbox-help = help/configtab_db9.htm
-configuration-database-export-single-dbox-help = help/configtab_db10.htm
-configuration-database-plugin-setting-help = help/configtab_db11.htm
-configuration-database-default-indexes-help = help/configtab_db12.htm
-configuration-database-attrenc-help = help/configtab_db13.htm
-configuration-database-attrenc-add-dbox-help = help/configtab_db14.htm
-configuration-database-attrenc-method-select-dbox-help = help/configtab_db15.htm
-
-;Chaining Database Icon
-configuration-new-chaining-instance-dbox-help = help/configtab_chaindb.htm
-configuration-chaining-settings-help = help/configtab_chaindb2.htm
-configuration-chaining-settings-ctrl-chooser-dbox-help = help/configtab_chaindb3.htm
-configuration-chaining-settings-comp-chooser-dbox-help = help/configtab_chaindb4.htm
-configuration-chaining-default-help = help/configtab_chaindb5.htm
-configuration-chaining-connection-help = help/configtab_chaindb6.htm
-configuration-chaining-authentication-help = help/configtab_chaindb7.htm
-
-;LDBM Database Instance Icon
-configuration-new-ldbm-instance-dbox-help =  help/configtab_ldbmdb.htm
-
-;Mapping Tree/Suffix
-configuration-mapping-setting-help = help/configtab_maptree.htm
-configuration-mapping-add-backend-dbox-help = help/configtab_maptree2.htm
-configuration-mapping-database-help = help/configtab_maptree3.htm
-configuration-mapping-referral-help = help/configtab_maptree4.htm
-configuration-new-mapping-node-dbox-help = help/configtab_maptree5.htm
-configuration-new-mapping-sub-suffix-dbox-help = help/configtab_maptree6.htm
-configuration-confirm-delete-suffix-dbox-help = help/configtab_maptree7.htm
-
-
-;Schema Icon
-configuration-schema-objclass-help = help/configtab_schema.htm
-configuration-schema-objclass-create-dbox-help = help/configtab_schema2.htm
-configuration-schema-attr-help = help/configtab_schema3.htm
-configuration-schema-attr-create-dbox-help = help/configtab_schema4.htm
-configuration-schema-mrule-help = help/configtab_schema5.htm
-
-;Replication Agreements Icon
-configuration-replication-legacyconsumersettings-help = help/configtab_replication.htm
-configuration-replication-suppliersettings-help = help/configtab_replication2.htm
-configuration-replication-replicasettings-help = help/configtab_replication3.htm
-configuration-replication-summary-help = help/configtab_replication4.htm
-configuration-replication-schedule-help = help/configtab_replication5.htm
-configuration-replication-content-help = help/configtab_replication6.htm
-configuration-replication-host-dbox-help = help/configtab_replication7.htm
-configuration-replication-export-help = help/configtab_replication8.htm
-
-;Logs Icon
-configuration-logs-access-help = help/configtab_logs.htm
-configuration-logs-error-help = help/configtab_logs2.htm
-configuration-logs-audit-help = help/configtab_logs3.htm
-
-;Plugins Icons
-configuration-plugins-help = help/configtab_plugins.htm
-
-
-;REPLICATION AGREEMENT WIZARD
-replication-wizard-content-help = help/replication_wizard.htm
-replication-wizard-schedule-help = help/replication_wizard2.htm
-replication-wizard-consumerinit-help = help/replication_wizard3.htm
-replication-wizard-summary-help = help/replication_wizard4.htm
-replication-wizard-legacyrmmrname-help = help/replication_wizard5.htm
+; --- BEGIN COPYRIGHT BLOCK ---
+; 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; version 2 of the License.
+;
+; 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., 59 Temple
+; Place, Suite 330, Boston, MA 02111-1307 USA.
+;
+; In addition, as a special exception, Red Hat, Inc. gives You the additional
+; right to link the code of this Program with code not covered under the GNU
+; General Public License ("Non-GPL Code") and to distribute linked combinations
+; including the two, subject to the limitations in this paragraph. Non-GPL Code
+; permitted under this exception must only link to the code of this Program
+; through those well defined interfaces identified in the file named EXCEPTION
+; found in the source code files (the "Approved Interfaces"). The files of
+; Non-GPL Code may instantiate templates or use macros or inline functions from
+; the Approved Interfaces without causing the resulting work to be covered by
+; the GNU General Public License. Only Red Hat, Inc. may make changes or
+; additions to the list of Approved Interfaces. You must obey the GNU General
+; Public License in all respects for all of the Program code and other code used
+; in conjunction with the Program except the Non-GPL Code covered by this
+; exception. If you modify this file, you may extend this exception to your
+; version of the file, but you are not obligated to do so. If you do not wish to
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
+;
+;
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2007 Red Hat, Inc.
+; All rights reserved.
+; --- END COPYRIGHT BLOCK ---
+
+;-------------------------------------------MAPPINGS
+; UI Reference Token = help/filename.htm
+;-------------------------------------------PROGRAMS
+;
+;MENU BAR
+;
+;Help Menu from all tabs
+framework-menubar-contents = help/redir_agtoc.htm
+preferences-confirmation-help = help/helpmenu.htm
+framework-menubar-dochome = help/redir_dochome.htm
+
+;TASKS TAB
+tasks-backup-help = help/taskstab_bkup_restore.htm
+tasks-restore-help = help/taskstab_bkup_restore2.htm
+
+
+;CONFIGURATION TAB
+;Root Node
+configuration-system-settings-help = help/configtab_rootnode.htm
+configuration-system-performance-help = help/configtab_rootnode2.htm
+configuration-system-encryption-help = help/configtab_rootnode3.htm
+configuration-system-snmp-help = help/configtab_rootnode5.htm
+configuration-system-manager-help = help/configtab_rootnode6.htm
+configuration-system-sasl-help = help/configtab_rootnode7.htm
+configuration-system-sasl-add-dbox-help = help/configtab_rootnode8.htm
+configuration-system-sasl-mod-dbox-help = help/configtab_rootnode9.htm
+
+;Database Icon
+configuration-database-indexes-help = help/configtab_db.htm
+configuration-database-passwords-help = help/configtab_db2.htm
+configuration-database-accountlockout-help = help/configtab_db3.htm
+configuration-database-indexes-add-dbox-help = help/configtab_db4.htm
+configuration-database-settings-help = help/configtab_db5.htm
+configuration-database-import-ldap-dbox-help = help/configtab_db6.htm
+configuration-database-import-fastwire-dbox-help = help/configtab_db7.htm
+configuration-database-initialize-backend-dbox-help = help/configtab_db8.htm
+configuration-database-export-dbox-help = help/configtab_db9.htm
+configuration-database-export-single-dbox-help = help/configtab_db10.htm
+configuration-database-plugin-setting-help = help/configtab_db11.htm
+configuration-database-default-indexes-help = help/configtab_db12.htm
+configuration-database-attrenc-help = help/configtab_db13.htm
+configuration-database-attrenc-add-dbox-help = help/configtab_db14.htm
+configuration-database-attrenc-method-select-dbox-help = help/configtab_db15.htm
+
+;Chaining Database Icon
+configuration-new-chaining-instance-dbox-help = help/configtab_chaindb.htm
+configuration-chaining-settings-help = help/configtab_chaindb2.htm
+configuration-chaining-settings-ctrl-chooser-dbox-help = help/configtab_chaindb3.htm
+configuration-chaining-settings-comp-chooser-dbox-help = help/configtab_chaindb4.htm
+configuration-chaining-default-help = help/configtab_chaindb5.htm
+configuration-chaining-connection-help = help/configtab_chaindb6.htm
+configuration-chaining-authentication-help = help/configtab_chaindb7.htm
+
+;LDBM Database Instance Icon
+configuration-new-ldbm-instance-dbox-help =  help/configtab_ldbmdb.htm
+
+;Mapping Tree/Suffix
+configuration-mapping-setting-help = help/configtab_maptree.htm
+configuration-mapping-add-backend-dbox-help = help/configtab_maptree2.htm
+configuration-mapping-database-help = help/configtab_maptree3.htm
+configuration-mapping-referral-help = help/configtab_maptree4.htm
+configuration-new-mapping-node-dbox-help = help/configtab_maptree5.htm
+configuration-new-mapping-sub-suffix-dbox-help = help/configtab_maptree6.htm
+configuration-confirm-delete-suffix-dbox-help = help/configtab_maptree7.htm
+
+
+;Schema Icon
+configuration-schema-objclass-help = help/configtab_schema.htm
+configuration-schema-objclass-create-dbox-help = help/configtab_schema2.htm
+configuration-schema-attr-help = help/configtab_schema3.htm
+configuration-schema-attr-create-dbox-help = help/configtab_schema4.htm
+configuration-schema-mrule-help = help/configtab_schema5.htm
+
+;Replication Agreements Icon
+configuration-replication-legacyconsumersettings-help = help/configtab_replication.htm
+configuration-replication-suppliersettings-help = help/configtab_replication2.htm
+configuration-replication-replicasettings-help = help/configtab_replication3.htm
+configuration-replication-summary-help = help/configtab_replication4.htm
+configuration-replication-schedule-help = help/configtab_replication5.htm
+configuration-replication-content-help = help/configtab_replication6.htm
+configuration-replication-host-dbox-help = help/configtab_replication7.htm
+configuration-replication-export-help = help/configtab_replication8.htm
+
+;Logs Icon
+configuration-logs-access-help = help/configtab_logs.htm
+configuration-logs-error-help = help/configtab_logs2.htm
+configuration-logs-audit-help = help/configtab_logs3.htm
+
+;Plugins Icons
+configuration-plugins-help = help/configtab_plugins.htm
+
+
+;REPLICATION AGREEMENT WIZARD
+replication-wizard-content-help = help/replication_wizard.htm
+replication-wizard-schedule-help = help/replication_wizard2.htm
+replication-wizard-consumerinit-help = help/replication_wizard3.htm
+replication-wizard-summary-help = help/replication_wizard4.htm
+replication-wizard-legacyrmmrname-help = help/replication_wizard5.htm
 replication-wizard-attribute-help = help/replication_wizard6.htm
-;replication-wizard-cirsirselect-help = help/replication_wizard6.htm
-;replication-wizard-cirsirname-help = help/replication_wizard7.htm
-
+;replication-wizard-cirsirselect-help = help/replication_wizard6.htm
+;replication-wizard-cirsirname-help = help/replication_wizard7.htm
+
 ;WINDOWS SYNC AGREEMENT WIZARD
 sync-wizard-agreement-help = help/synchronization_wizard1.htm
 sync-wizard-content-help = help/synchronization_wizard2.htm
@@ -119,60 +149,60 @@
 configuration-sync-schedule-help = help/configtab_synchronization2.htm
 configuration-sync-connection-help = help/configtab_synchronization3.htm
 
-
-;DIRECTORY TAB
-;Role Configuration
-configuration-role-member-filtered-help = help/dirtab_role.htm
-configuration-role-member-managed-help = help/dirtab_role2.htm
-configuration-role-member-nested-help = help/dirtab_role3.htm
-configuration-role-account-help = help/dirtab_role4.htm
-configuration-role-info-help = help/dirtab_role5.htm
-configuration-set-role = help/dirtab_role6.htm
-configuration-choose-role = help/dirtab_role7.htm
-
-;Fine-Grained Password Policy Configuration
-configuration-browser-passwords-help = help/dir_browser2.htm
-configuration-browser-accountlockout-help = help/dir_browser3.htm
-configuration-set-referral = help/dir_browser4.htm
-
-;CoS Configuration
-configuration-cos-attributes-help = help/dirtab_cos.htm
-configuration-cos-info-help = help/dirtab_cos2.htm
-configuration-cos-template-help = help/dirtab_cos3.htm
-
-;STATUS TAB
-;Replication Icon
-status-replication-help = help/statustab_replication.htm
-
-;Logs Icon
-status-logs-access-help = help/statustab_logs.htm
-status-logs-error-help = help/statustab_logs2.htm
-status-logs-audit-help = help/statustab_logs3.htm
-
-;Performance Counters Icon
-status-perfcounters-server-help = help/statustab_performance.htm
-status-perfcounters-database-help = help/statustab_performance2.htm
-
-;General Server Status
-status-server-general-help = help/statustab_general.htm
-
-;PROPERTY EDITOR WINDOWS
-property-main-help = help/property_editor.htm
-property-new-objectclass-dbox-help = help/property_editor2.htm
-property-new-attribute-dbox-help = help/property_editor3.htm
-property-main-create-help = help/property_editor4.htm
-
-;LDAP URL Construction Dialog
-configuration-construct-new-url-dbox-help = help/ldap_url.htm
-
-;Account Management Dialog
-configuration-user-account-help = help/account_mgmt.htm
-
-;VERY ADVANCED SEARCH DIALOG BOX
-search-dbox-veryadvanced-help = help/adv_search.htm
-
-;INSTALL
-menubar-newinstance-dbox-help = help/new_instance.htm
-
-; SUBTREE SELECTION DIALOG BOX
-subtree-selection-dbox-help = help/dir_browser.htm
+
+;DIRECTORY TAB
+;Role Configuration
+configuration-role-member-filtered-help = help/dirtab_role.htm
+configuration-role-member-managed-help = help/dirtab_role2.htm
+configuration-role-member-nested-help = help/dirtab_role3.htm
+configuration-role-account-help = help/dirtab_role4.htm
+configuration-role-info-help = help/dirtab_role5.htm
+configuration-set-role = help/dirtab_role6.htm
+configuration-choose-role = help/dirtab_role7.htm
+
+;Fine-Grained Password Policy Configuration
+configuration-browser-passwords-help = help/dir_browser2.htm
+configuration-browser-accountlockout-help = help/dir_browser3.htm
+configuration-set-referral = help/dir_browser4.htm
+
+;CoS Configuration
+configuration-cos-attributes-help = help/dirtab_cos.htm
+configuration-cos-info-help = help/dirtab_cos2.htm
+configuration-cos-template-help = help/dirtab_cos3.htm
+
+;STATUS TAB
+;Replication Icon
+status-replication-help = help/statustab_replication.htm
+
+;Logs Icon
+status-logs-access-help = help/statustab_logs.htm
+status-logs-error-help = help/statustab_logs2.htm
+status-logs-audit-help = help/statustab_logs3.htm
+
+;Performance Counters Icon
+status-perfcounters-server-help = help/statustab_performance.htm
+status-perfcounters-database-help = help/statustab_performance2.htm
+
+;General Server Status
+status-server-general-help = help/statustab_general.htm
+
+;PROPERTY EDITOR WINDOWS
+property-main-help = help/property_editor.htm
+property-new-objectclass-dbox-help = help/property_editor2.htm
+property-new-attribute-dbox-help = help/property_editor3.htm
+property-main-create-help = help/property_editor4.htm
+
+;LDAP URL Construction Dialog
+configuration-construct-new-url-dbox-help = help/ldap_url.htm
+
+;Account Management Dialog
+configuration-user-account-help = help/account_mgmt.htm
+
+;VERY ADVANCED SEARCH DIALOG BOX
+search-dbox-veryadvanced-help = help/adv_search.htm
+
+;INSTALL
+menubar-newinstance-dbox-help = help/new_instance.htm
+
+; SUBTREE SELECTION DIALOG BOX
+subtree-selection-dbox-help = help/dir_browser.htm