From fedora-directory-commits at redhat.com Mon Oct 2 15:57:49 2006 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Mon, 2 Oct 2006 08:57:49 -0700 Subject: [Fedora-directory-commits] mod_nss nss_engine_pphrase.c,1.7,1.8 Message-ID: <200610021557.k92Fvn0a029480@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29453 Modified Files: nss_engine_pphrase.c Log Message: 208848 If the password stored in a file pointed to by NSSPassPhraseDialog didn't match the database password then Apache would core on Solaris (because passwd was NULL). The error message is still a bit lackluster but at least it doesn't core anymore. Index: nss_engine_pphrase.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_pphrase.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nss_engine_pphrase.c 25 Aug 2006 20:19:48 -0000 1.7 +++ nss_engine_pphrase.c 2 Oct 2006 15:57:47 -0000 1.8 @@ -126,7 +126,7 @@ } } - if (parg->mc->nInitCount == 1) { + if ((parg->mc->nInitCount == 1) && (passwd != NULL)) { char buf[1024]; apr_status_t rv; apr_size_t nBytes = 1024; From fedora-directory-commits at redhat.com Tue Oct 3 20:41:33 2006 From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea)) Date: Tue, 3 Oct 2006 13:41:33 -0700 Subject: [Fedora-directory-commits] coolkey/applet/doc - New directory Message-ID: <200610032041.k93KfXFc014257@cvs-int.fedora.redhat.com> Author: rrelyea Update of /cvs/dirsec/coolkey/applet/doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14242/doc Log Message: Directory /cvs/dirsec/coolkey/applet/doc added to the repository From fedora-directory-commits at redhat.com Wed Oct 4 17:35:20 2006 From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea)) Date: Wed, 4 Oct 2006 10:35:20 -0700 Subject: [Fedora-directory-commits] coolkey/applet/src/com/redhat/ckey/applet ASN1.java, 1.1, 1.2 CardEdge.java, 1.1, 1.2 MemoryManager.java, 1.1, 1.2 ObjectManager.java, 1.1, 1.2 Message-ID: <200610041735.k94HZKJn022175@cvs-int.fedora.redhat.com> Author: rrelyea Update of /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22105 Modified Files: ASN1.java CardEdge.java MemoryManager.java ObjectManager.java Log Message: Update package names, fix compile issues Index: ASN1.java =================================================================== RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/ASN1.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ASN1.java 18 Aug 2006 18:37:13 -0000 1.1 +++ ASN1.java 4 Oct 2006 17:35:18 -0000 1.2 @@ -49,7 +49,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // END LICENSE_BLOCK -package com.redhat.nkey.applet; +package com.redhat.ckey.applet; import javacard.framework.ISOException; import javacard.framework.JCSystem; Index: CardEdge.java =================================================================== RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/CardEdge.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CardEdge.java 18 Aug 2006 18:37:13 -0000 1.1 +++ CardEdge.java 4 Oct 2006 17:35:18 -0000 1.2 @@ -59,7 +59,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // END LICENSE_BLOCK -package com.redhat.nkey.applet; +package com.redhat.ckey.applet; import javacard.framework.*; import javacard.security.*; @@ -68,7 +68,7 @@ import visa.openplatform.ProviderSecurityDomain; import visa.openplatform.OPSystem; -// Referenced classes of package com.redhat.nkey.applet: +// Referenced classes of package com.redhat.ckey.applet: // MemoryManager, ObjectManager, ASN1 /** @@ -123,8 +123,8 @@ private static final byte VERSION_PROTOCOL_MINOR = 1; private static final byte VERSION_APPLET_MAJOR = 1; private static final byte VERSION_APPLET_MINOR = 3; - private static final short BUILDID_MAJOR = (short) 0x4472; - private static final short BUILDID_MINOR = (short) 0x4aa7; + private static final short BUILDID_MAJOR = (short) 0x4523; + private static final short BUILDID_MINOR = (short) 0xee54; private static final short ZEROS = 0; // * Enable pin size check @@ -2343,9 +2343,9 @@ ISOException.throwIt(SW_OPERATION_NOT_ALLOWED); } create_object_ACL = Util.getShort(buffer, ISO7816.OFFSET_CDATA); - create_key_ACL = Util.getShort(buffer, (short)ISO7816.OFFSET_CDATA + 2); - create_pin_ACL = Util.getShort(buffer, (short)ISO7816.OFFSET_CDATA + 4); - enable_ACL_change = buffer[ISO719.OFFSET_CDATA+6]; + create_key_ACL = Util.getShort(buffer,(short)(ISO7816.OFFSET_CDATA+2)); + create_pin_ACL = Util.getShort(buffer,(short)(ISO7816.OFFSET_CDATA+4)); + enable_ACL_change = buffer[ISO7816.OFFSET_CDATA+6]; isWritable = 0; if (((create_object_ACL & 0xff) != 0) && ((create_key_ACL & 0xff) != 0)) { Index: MemoryManager.java =================================================================== RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/MemoryManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MemoryManager.java 18 Aug 2006 18:37:13 -0000 1.1 +++ MemoryManager.java 4 Oct 2006 17:35:18 -0000 1.2 @@ -56,7 +56,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // END LICENSE_BLOCK -package com.redhat.nkey.applet; +package com.redhat.ckey.applet; import javacard.framework.Util; Index: ObjectManager.java =================================================================== RCS file: /cvs/dirsec/coolkey/applet/src/com/redhat/ckey/applet/ObjectManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ObjectManager.java 18 Aug 2006 18:37:13 -0000 1.1 +++ ObjectManager.java 4 Oct 2006 17:35:18 -0000 1.2 @@ -57,12 +57,12 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // END LICENSE_BLOCK -package com.redhat.nkey.applet; +package com.redhat.ckey.applet; import javacard.framework.ISOException; import javacard.framework.Util; -// Referenced classes of package com.redhat.nkey.applet: +// Referenced classes of package com.redhat.ckey.applet: // MemoryManager /** From fedora-directory-commits at redhat.com Wed Oct 4 17:37:57 2006 From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea)) Date: Wed, 4 Oct 2006 10:37:57 -0700 Subject: [Fedora-directory-commits] coolkey/applet update_buildid.pl, NONE, 1.1 Message-ID: <200610041737.k94HbvSl022207@cvs-int.fedora.redhat.com> Author: rrelyea Update of /cvs/dirsec/coolkey/applet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22191 Added Files: update_buildid.pl Log Message: perl script needed to applet build number --- NEW FILE update_buildid.pl --- #!/usr/bin/perl # # BEGIN LICENSE BLOCK # Copyright (c) 1999-2002 David Corcoran # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # 3. The name of the author may not be used to endorse or promote products # derived from this software without specific prior written permission. # # Changes to this license can be made only by the copyright author with # explicit written consent. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # Alternatively, the contents of this file may be used under the terms of # the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which # case the provisions of the LGPL are applicable instead of those above. If # you wish to allow use of your version of this file only under the terms # of the LGPL, and not to allow others to use your version of this file # under the terms of the BSD license, indicate your decision by deleting # the provisions above and replace them with the notice and other # provisions required by the LGPL. If you do not delete the provisions # above, a recipient may use your version of this file under the terms of # either the BSD license or the LGPL. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END LICENSE BLOCK use strict; my $file; my $line; my $cvsuser = $ENV{'CVSUSER'} ; my $buildid = time(); my $buildid_major; my $buildid_minor; my $version_major; my $version_minor; foreach $file (@ARGV) { findVersion($file); } if ($cvsuser ne 'robobld') { $buildid_major = ($buildid >> 16) & 0xffff; $buildid_minor = $buildid & 0xffff; } printf ("buildID: %d.%d.%04x%04x\n", $version_major, $version_minor, $buildid_major, $buildid_minor); open OUTPUT, ">.buildid" or die; printf OUTPUT "%d.%d.%04x%04x", $version_major, $version_minor, $buildid_major, $buildid_minor; close OUTPUT; if ($cvsuser ne 'robobld') { $buildid_major = sprintf("0x%04x", $buildid_major); $buildid_minor = sprintf("0x%04x", $buildid_minor); foreach $file (@ARGV) { replaceBuildId($file); } } sub findVersion { my $file = $_[0]; # printf("findVersion: file = %s\n", $file); open INPUT, "<$file" or die; while ($line = ) { if( $line =~ /VERSION_APPLET_MAJOR\s*=\s*([0-9]*)\s*;/ ) { $version_major = $1; } if( $line =~ /VERSION_APPLET_MINOR\s*=\s*([0-9]*)\s*;/ ) { $version_minor = $1; } if( $line =~ /BUILDID_MAJOR\s*=.*(0x[0-9a-fA-F]{4})\s*;/ ) { $buildid_major = eval($1); } if( $line =~ /BUILDID_MINOR\s*=.*(0x[0-9a-fA-F]{4})\s*;/ ) { $buildid_minor = eval($1); } } close INPUT; } sub replaceBuildId { my $file = $_[0]; # printf("replaceBuildID: file = %s\n", $file); open INPUT, "<$file" or die; open OUTPUT, ">$file.new" or die; while($line = ) { # This shouldn't be necessary, but Perl isn't automatically stripping # out the CRs on my PC. $line =~ s/\r//g; if( $line =~ /BUILDID_MAJOR\s*=.*(0x[0-9a-fA-F]{4})\s*;/ ) { $line =~ s/$1/$buildid_major/; } if( $line =~ /BUILDID_MINOR\s*=.*(0x[0-9a-fA-F]{4})\s*;/ ) { $line =~ s/$1/$buildid_minor/; } print OUTPUT $line; } print "mv $file.new $file\n"; close INPUT; close OUTPUT; rename "$file.new", $file or die; } From fedora-directory-commits at redhat.com Wed Oct 4 18:16:07 2006 From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea)) Date: Wed, 4 Oct 2006 11:16:07 -0700 Subject: [Fedora-directory-commits] coolkey/applet Makefile,1.1,1.2 Message-ID: <200610041816.k94IG7i3025466@cvs-int.fedora.redhat.com> Author: rrelyea Update of /cvs/dirsec/coolkey/applet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25449 Modified Files: Makefile Log Message: Get build working Index: Makefile =================================================================== RCS file: /cvs/dirsec/coolkey/applet/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 18 Aug 2006 18:37:13 -0000 1.1 +++ Makefile 4 Oct 2006 18:16:04 -0000 1.2 @@ -46,8 +46,6 @@ CORE_DEPTH = .. -include ../coreconf/config.mk - ############################################################################# # Locations of toolkits. # @@ -74,6 +72,16 @@ -include custom.mk +ifdef SLB_DIR +SLB_JAVA_DIR=$(SLB_DIR)/Smart Cards and Terminals/Cyberflex Access Kits/v4/ +endif + +ifdef windir +SEP=";" +else +SEP=":" +endif + ############################################################################# # Build Constants @@ -90,7 +98,7 @@ # # The Java package to which the applet belongs. # -PACKAGE=com.redhat.nkey.applet +PACKAGE=com.redhat.ckey.applet # # The unqualified name of the applet class. @@ -139,8 +147,9 @@ # # The classpath needed to compile the Java source code. # -BUILD_CLASSPATH="$(JAVACARD_KIT_DIR)/lib/javacardframework.jar;$(JAVACARD_KIT_DIR)/lib/api.jar;jars/visaop20.jar" +BUILD_CLASSPATH="$(JAVACARD_KIT_DIR)/lib/javacardframework.jar$(SEP)$(JAVACARD_KIT_DIR)/lib/api.jar$(SEP)jars/visaop20.jar" +#BUILD_CLASSPATH="$(JAVACARD_KIT_DIR)/lib/javacardframework.jar" # # build rule # @@ -160,17 +169,24 @@ # # Classpath for the converter. # -CONVERT_CLASSPATH="$(JAVACARD_KIT_DIR)/lib/converter.jar;$(JAVACARD_KIT_DIR)/lib/offcardverifier.jar;$(SLB_DIR)/Smart Cards and Terminals/Cyberflex Access Kits/v4/Classlibrary/jc_api_212.jar" +CONVERT_CLASSPATH="$(JAVACARD_KIT_DIR)/lib/converter.jar$(SEP)$(JAVACARD_KIT_DIR)/lib/offcardverifier.jar$(SEP)$(SLB_JAVA_DIR)/Classlibrary/jc_api_212.jar" # # Location of the .exp files, used for "linking" Javacard code. # -EXPORT_PATH="$(SLB_DIR)\Smart Cards and Terminals\Cyberflex Access Kits\v4\Toolkit\PRGMaker\Export Files" +EXPORT_PATH="$(SLB_JAVA_DIR)/Toolkit/PRGMaker/Export Files" # # build rule # $(CONVERTER_OUTPUT_DIR)/applet.jar: $(JAVA_CLASS_FILES) + @if [ "$(JAVACARD_KIT_DIR)" = "" -o "$(JAVA_HOME)" = "" -o "$(SLB_JAVA_DIR)" = "" ]; then \ + echo "Not all necessary variables have been set."; \ + echo "JAVACARD_KIT_DIR=$(JAVA_CARD_KIT_DIR)"; \ + echo "JAVA_HOME=$(JAVA_HOME)"; \ + echo "SLB_JAVA_DIR=$(SLB_JAVA_DIR)"; \ + exit 1; \ + fi $(JAVA) -classpath ${CONVERT_CLASSPATH} com.sun.javacard.converter.Converter -classdir $(OUTPUT_DIR) -out EXP JCA CAP -exportpath $(EXPORT_PATH) -applet $(AID) $(APPLET_QUALIFIED_CLASS_NAME) -d $(OUTPUT_DIR) $(PACKAGE) $(PID) 1.0 mv $(CONVERTER_OUTPUT_DIR)/applet.cap $@ @@ -185,7 +201,7 @@ # # Classpath for the IJC converter. # -IJC_CLASSPATH="$(SLB_DIR)\Smart Cards and Terminals\Cyberflex Access Kits\v4\Toolkit\PRGMaker\makeijc.jar" +IJC_CLASSPATH="$(SLB_JAVA_DIR)/Toolkit/PRGMaker/makeijc.jar" # # build rule From fedora-directory-commits at redhat.com Thu Oct 5 00:57:38 2006 From: fedora-directory-commits at redhat.com (Robert Relyea (rrelyea)) Date: Wed, 4 Oct 2006 17:57:38 -0700 Subject: [Fedora-directory-commits] coolkey/applet Makefile,1.2,1.3 Message-ID: <200610050057.k950vcvQ023196@cvs-int.fedora.redhat.com> Author: rrelyea Update of /cvs/dirsec/coolkey/applet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23179 Modified Files: Makefile Log Message: Fetch visa open platform externally. Index: Makefile =================================================================== RCS file: /cvs/dirsec/coolkey/applet/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 4 Oct 2006 18:16:04 -0000 1.2 +++ Makefile 5 Oct 2006 00:57:36 -0000 1.3 @@ -70,9 +70,15 @@ # #SLB_DIR=c:\Program Files\Schlumberger +# +# The top-level of the open platform toolkey +# +#OPEN_PLATFORM_DIR=C:/open_platform + -include custom.mk ifdef SLB_DIR +# sub directory of Schlumberger's Cyberflex SDK. SLB_JAVA_DIR=$(SLB_DIR)/Smart Cards and Terminals/Cyberflex Access Kits/v4/ endif @@ -147,7 +153,7 @@ # # The classpath needed to compile the Java source code. # -BUILD_CLASSPATH="$(JAVACARD_KIT_DIR)/lib/javacardframework.jar$(SEP)$(JAVACARD_KIT_DIR)/lib/api.jar$(SEP)jars/visaop20.jar" +BUILD_CLASSPATH="$(JAVACARD_KIT_DIR)/lib/javacardframework.jar$(SEP)$(JAVACARD_KIT_DIR)/lib/api.jar$(SEP)$(OPEN_PLATFORM_DIR)/jc211/bin/visaop20.jar" #BUILD_CLASSPATH="$(JAVACARD_KIT_DIR)/lib/javacardframework.jar" # @@ -180,11 +186,12 @@ # build rule # $(CONVERTER_OUTPUT_DIR)/applet.jar: $(JAVA_CLASS_FILES) - @if [ "$(JAVACARD_KIT_DIR)" = "" -o "$(JAVA_HOME)" = "" -o "$(SLB_JAVA_DIR)" = "" ]; then \ + @if [ "$(JAVACARD_KIT_DIR)" = "" -o "$(JAVA_HOME)" = "" -o "$(SLB_JAVA_DIR)" = "" -o "$(OPEN_PLATFORM_DIR)" = "" ]; then \ echo "Not all necessary variables have been set."; \ echo "JAVACARD_KIT_DIR=$(JAVA_CARD_KIT_DIR)"; \ echo "JAVA_HOME=$(JAVA_HOME)"; \ echo "SLB_JAVA_DIR=$(SLB_JAVA_DIR)"; \ + echo "OPEN_PLATFORM_DIR=$(OPEN_PLATFORM_DIR)"; \ exit 1; \ fi $(JAVA) -classpath ${CONVERT_CLASSPATH} com.sun.javacard.converter.Converter -classdir $(OUTPUT_DIR) -out EXP JCA CAP -exportpath $(EXPORT_PATH) -applet $(AID) $(APPLET_QUALIFIED_CLASS_NAME) -d $(OUTPUT_DIR) $(PACKAGE) $(PID) 1.0 @@ -208,8 +215,8 @@ # $(CONVERTER_OUTPUT_DIR)/applet.ijc: $(CONVERTER_OUTPUT_DIR)/applet.jar $(JAVA) -classpath $(IJC_CLASSPATH) com.slb.javacard.jctools.ijc.MakeIJC -verbose -expFileDir $(EXPORT_PATH) -type onCardVerifier $(CONVERTER_OUTPUT_DIR)/applet.jar - mkdir -p ../dist/$(OBJDIR)/bin - cp $@ ../dist/$(OBJDIR)/bin/CardEdge.$(shell cat .buildid).ijc + - at mkdir -p .libs + cp $@ .libs/CardEdge.$(shell cat .buildid).ijc export: From fedora-directory-commits at redhat.com Thu Oct 5 21:14:04 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 5 Oct 2006 14:14:04 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/chainingdb cb_search.c, 1.5, 1.6 Message-ID: <200610052114.k95LE4iW032561@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32498/ldap/servers/plugins/chainingdb Modified Files: cb_search.c Log Message: [204808] spurious search timeouts Fixed a problem that ldapsearch reports random timeouts on 64-bit machine. Index: cb_search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_search.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cb_search.c 19 Apr 2005 22:07:29 -0000 1.5 +++ cb_search.c 5 Oct 2006 21:14:01 -0000 1.6 @@ -179,7 +179,7 @@ slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_ENTRY, NULL ); return 1; } - timeout.tv_sec=timelimit-(now-optime); + timeout.tv_sec=(time_t)timelimit-(now-optime); timeout.tv_usec=0; } @@ -414,7 +414,10 @@ { char *target; - int sizelimit,timelimit, rc, parse_rc, optime,i,retcode, attrsonly; + int sizelimit, timelimit; + int rc, parse_rc, retcode; + int i, attrsonly; + time_t optime; LDAPMessage *res=NULL; char *matched_msg,*error_msg; cb_searchContext *ctx=NULL; From fedora-directory-commits at redhat.com Thu Oct 5 21:14:04 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 5 Oct 2006 14:14:04 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd pblock.c, 1.5, 1.6 Message-ID: <200610052114.k95LE4Kt032567@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32498/ldap/servers/slapd Modified Files: pblock.c Log Message: [204808] spurious search timeouts Fixed a problem that ldapsearch reports random timeouts on 64-bit machine. Index: pblock.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pblock.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pblock.c 17 Aug 2006 15:33:03 -0000 1.5 +++ pblock.c 5 Oct 2006 21:14:02 -0000 1.6 @@ -348,7 +348,7 @@ (*(int *)value) = pblock->pb_op->o_params.operation_type; break; case SLAPI_OPINITIATED_TIME: - (*(int *)value) = pblock->pb_op->o_time; + (*(time_t *)value) = pblock->pb_op->o_time; break; case SLAPI_REQUESTOR_ISROOT: (*(int *)value) = pblock->pb_requestor_isroot; From fedora-directory-commits at redhat.com Thu Oct 5 21:14:05 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 5 Oct 2006 14:14:05 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldif search.c, 1.4, 1.5 Message-ID: <200610052114.k95LE5WD032573@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32498/ldap/servers/slapd/back-ldif Modified Files: search.c Log Message: [204808] spurious search timeouts Fixed a problem that ldapsearch reports random timeouts on 64-bit machine. Index: search.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldif/search.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- search.c 19 Apr 2005 22:07:39 -0000 1.4 +++ search.c 5 Oct 2006 21:14:02 -0000 1.5 @@ -143,7 +143,7 @@ /*Make sure we're not exceeding our time limit...*/ currtime = time(&dummy); - if ((tlimit > 0) && ((currtime - optime) > tlimit)){ + if ((tlimit > 0) && ((currtime - optime) > (time_t)tlimit)){ slapi_send_ldap_result( pb, LDAP_TIMELIMIT_EXCEEDED, NULL, NULL, nentries, NULL); /*We "hit" the cache*/ From fedora-directory-commits at redhat.com Thu Oct 5 23:05:01 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 5 Oct 2006 16:05:01 -0700 Subject: [Fedora-directory-commits] mod_admserv INSTALL, 1.1.1.1, 1.2 Makefile.am, 1.14, 1.15 Makefile.in, 1.18, 1.19 aclocal.m4, 1.10, 1.11 config.guess, 1.1.1.1, 1.2 config.sub, 1.1.1.1, 1.2 configure, 1.19, 1.20 configure.in, 1.16, 1.17 depcomp, 1.1.1.1, 1.2 install-sh, 1.1.1.1, 1.2 ltmain.sh, 1.2, 1.3 missing, 1.1.1.1, 1.2 mkinstalldirs, 1.1.1.1, 1.2 Message-ID: <200610052305.k95N51ik006490@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6432 Modified Files: INSTALL Makefile.am Makefile.in aclocal.m4 config.guess config.sub configure configure.in depcomp install-sh ltmain.sh missing mkinstalldirs Log Message: Bug(s) fixed: 209538 Bug Description: Allow mod_admserv to build with mozldap5/6 Reviewed by: nhosoi (Thanks!) Fix Description: If there is a mozldap6 package on the system, assume the lib suffix is 60, otherwise, 50. If no mozldap package is on the system, look for libldap60.so* in the given ldapsdk_lib directory. If found, assume 60, otherwise, 50. There were also a few problems with the way we were looking for ICU, mostly copy/paste errors, but one was that pkg-config does not have an icu package on some systems, so you have to use icu-config instead. Noriko pointed out that if both 50 and 60 libs are in the same dir, the 50 libs will be selected first - we want 60 libs to have preference. The new diffs will select 60 libs if found, or 50 libs if not. Platforms tested: FC5 Flag Day: no Doc impact: no Index: INSTALL =================================================================== RCS file: /cvs/dirsec/mod_admserv/INSTALL,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- INSTALL 20 Jun 2005 19:25:13 -0000 1.1.1.1 +++ INSTALL 5 Oct 2006 23:04:56 -0000 1.2 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives @@ -102,16 +102,16 @@ Installation Names ================== -By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PREFIX'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PREFIX', the package will -use PREFIX as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular @@ -159,7 +159,7 @@ need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will +use the option `--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -189,8 +189,13 @@ ./configure CC=/usr/local2/bin/gcc -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. `configure' Invocation ====================== Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.am 9 Mar 2006 17:28:05 -0000 1.14 +++ Makefile.am 5 Oct 2006 23:04:56 -0000 1.15 @@ -8,7 +8,7 @@ ## Set the includes and libraries needed INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ -LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 +LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap at ldapsdk_ver@ -lprldap at ldapsdk_ver@ -lldap at ldapsdk_ver@ @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 EXTRA_CPPFLAGS=@extra_cppflags@ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Makefile.in 9 Mar 2006 17:28:05 -0000 1.18 +++ Makefile.in 5 Oct 2006 23:04:56 -0000 1.19 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 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. @@ -13,185 +13,255 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ +build_triplet = @build@ host_triplet = @host@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ + ChangeLog INSTALL NEWS config.guess config.sub depcomp \ + install-sh ltmain.sh missing mkinstalldirs +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +libmodadmserv_la_LIBADD = +am_libmodadmserv_la_OBJECTS = mod_admserv.lo +libmodadmserv_la_OBJECTS = $(am_libmodadmserv_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +SOURCES = $(libmodadmserv_la_SOURCES) +DIST_SOURCES = $(libmodadmserv_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ APR_CONFIG = @APR_CONFIG@ APXS = @APXS@ AR = @AR@ -AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EXEEXT = @EXEEXT@ F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ +FFLAGS = @FFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap at ldapsdk_ver@ -lprldap at ldapsdk_ver@ -lldap at ldapsdk_ver@ @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -OBJDUMP = @OBJDUMP@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -RC = @RC@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +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@ adminutil_inc = @adminutil_inc@ adminutil_lib = @adminutil_lib@ adminutil_ver = @adminutil_ver@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ apache_bin = @apache_bin@ apache_conf = @apache_conf@ apache_inc = @apache_inc@ apache_prefix = @apache_prefix@ apr_inc = @apr_inc@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ extra_cppflags = @extra_cppflags@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ icu_lib = @icu_lib@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ ldapsdk_inc = @ldapsdk_inc@ ldapsdk_lib = @ldapsdk_lib@ +ldapsdk_ver = @ldapsdk_ver@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ nspr_inc = @nspr_inc@ nspr_lib = @nspr_lib@ nss_inc = @nss_inc@ nss_lib = @nss_lib@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ lib_LTLIBRARIES = libmodadmserv.la - libmodadmserv_la_SOURCES = mod_admserv.c - #libmodadmserv_la_LDFLAGS = -module -avoid-version INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ - -LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 - EXTRA_CPPFLAGS = @extra_cppflags@ - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CPPFLAGS) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(lib_LTLIBRARIES) - -libmodadmserv_la_LDFLAGS = -libmodadmserv_la_LIBADD = -am_libmodadmserv_la_OBJECTS = mod_admserv.lo -libmodadmserv_la_OBJECTS = $(am_libmodadmserv_la_OBJECTS) - -DEFS = @DEFS@ -DEFAULT_INCLUDES = -I. -I$(srcdir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles - at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mod_admserv.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -CFLAGS = @CFLAGS@ -DIST_SOURCES = $(libmodadmserv_la_SOURCES) -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS aclocal.m4 config.guess config.sub configure \ - configure.in depcomp install-sh ltmain.sh missing mkinstalldirs -SOURCES = $(libmodadmserv_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): configure.in +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -libLTLIBRARIES_INSTALL = $(INSTALL) uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test -z "$dir" && dir=.; \ + test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -199,34 +269,33 @@ $(LINK) -rpath $(libdir) $(libmodadmserv_la_LDFLAGS) $(libmodadmserv_la_OBJECTS) $(libmodadmserv_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_admserv.Plo at am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: - at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: - at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` + at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: - at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -CCDEPMODE = @CCDEPMODE@ + at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -238,11 +307,6 @@ -rm -f libtool uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -251,6 +315,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -262,8 +327,24 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique GTAGS: @@ -272,29 +353,23 @@ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distcleancheck_listfiles = find . -type f -print + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - @list='$(DISTFILES)'; for file in $$list; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -315,26 +390,54 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/=build - mkdir $(distdir)/=inst + mkdir $(distdir)/_build + mkdir $(distdir)/_inst chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ - && cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -342,32 +445,49 @@ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - find $$dc_install_base -type f -print ; \ - exit 1; } >&2 ) \ - && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 distcleancheck: distclean - if test '$(srcdir)' = . ; then \ + @if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi - test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after distclean:" ; \ + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) - + for dir in "$(DESTDIR)$(libdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -379,7 +499,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -387,7 +507,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -399,13 +519,17 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -422,7 +546,9 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf autom4te.cache + -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -430,20 +556,30 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES -.PHONY: GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool dist dist-all dist-gzip \ - distcheck distclean distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags \ - distcleancheck distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ +.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ + dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck 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-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-am uninstall-info-am uninstall-libLTLIBRARIES + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES install-libLTLIBRARIES: libmodadmserv.la View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.10 -r 1.11 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/mod_admserv/aclocal.m4,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- aclocal.m4 9 Mar 2006 17:28:05 -0000 1.10 +++ aclocal.m4 5 Oct 2006 23:04:56 -0000 1.11 @@ -1,7 +1,7 @@ -# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# 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. @@ -11,2483 +11,1915 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# serial 48 AC_PROG_LIBTOOL -# 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. +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) -# 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 8 +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL -AC_PREREQ([2.52]) +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl - AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_][CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_][CC], - defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_][CXX], - defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl -# Copyright 2002 Free Software Foundation, Inc. [...8567 lines suppressed...] +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +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 +# --------------------- +# 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 +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# 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. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break done - done -done -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 - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done done -SED=$lt_cv_path_SED -]) -AC_MSG_RESULT([$SED]) -]) +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR Index: config.guess =================================================================== RCS file: /cvs/dirsec/mod_admserv/config.guess,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- config.guess 20 Jun 2005 19:25:24 -0000 1.1.1.1 +++ config.guess 5 Oct 2006 23:04:56 -0000 1.2 @@ -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 . # Please send patches to . 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' /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 echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # 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/mod_admserv/config.sub,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- config.sub 20 Jun 2005 19:25:18 -0000 1.1.1.1 +++ config.sub 5 Oct 2006 23:04:56 -0000 1.2 @@ -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 . 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.19 -r 1.20 configure Index: configure =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- configure 9 Mar 2006 17:28:51 -0000 1.19 +++ configure 5 Oct 2006 23:04:56 -0000 1.20 @@ -278,15 +278,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 @@ -462,7 +462,7 @@ # include #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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib adminutil_inc adminuti! l_lib adminutil_ver icu_lib nss_inc nss_lib extra_cppflags 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 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 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS! PKG_CONFIG ICU_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib ldapsdk_ver adminutil_inc adminutil_lib adminutil_ver icu_lib nss_inc nss_lib extra_cppflags LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1022,8 +1022,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] @@ -1508,7 +1508,7 @@ # Automake initialization -am__api_version="1.6" +am__api_version="1.9" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1671,7 +1671,6 @@ program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed - # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1685,6 +1684,39 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi + for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -1754,7 +1786,16 @@ SET_MAKE="MAKE=${MAKE-make}" fi - # test to see if srcdir already configured +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +# test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -1762,6 +1803,16 @@ { (exit 1); exit 1; }; } fi +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + # Define the identity of the package. PACKAGE=mod_admserv VERSION=1.0 @@ -1792,9 +1843,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1887,6 +1935,13 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2821,24 +2876,16 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null - +DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} cat > confinc << 'END' -doit: +am__doit: @echo done +.PHONY: am__doit END # If we don't find an include directive, just comment out the code. echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 @@ -2853,7 +2900,7 @@ # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU [...9214 lines suppressed...] + # Extract the first word of "icu-config", so it can be a program name with args. +set dummy icu-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_ICU_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ICU_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ICU_CONFIG="$ICU_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_ICU_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 +ICU_CONFIG=$ac_cv_path_ICU_CONFIG + +if test -n "$ICU_CONFIG"; then + echo "$as_me:$LINENO: result: $ICU_CONFIG" >&5 +echo "${ECHO_T}$ICU_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists icu; then icu_lib=`$PKG_CONFIG --libs-only-L icu` - else - { { echo "$as_me:$LINENO: error: ADMINUTIL not found, specify with --with-icu." >&5 -echo "$as_me: error: ADMINUTIL not found, specify with --with-icu." >&2;} - { (exit 1); exit 1; }; } fi fi + if test -z "$icu_lib" ; then + if test -n "$ICU_CONFIG" ; then + icu_lib=`$ICU_CONFIG --ldflags-searchpath` + fi + fi + if test -z "$icu_lib" ; then + { { echo "$as_me:$LINENO: error: ICU not found, specify with --with-icu." >&5 +echo "$as_me: error: ICU not found, specify with --with-icu." >&2;} + { (exit 1); exit 1; }; } + fi fi -if test -z "$adminutil_lib"; then - { { echo "$as_me:$LINENO: error: ADMINUTIL not found, specify with --with-icu." >&5 -echo "$as_me: error: ADMINUTIL not found, specify with --with-icu." >&2;} +if test -z "$icu_lib"; then + { { echo "$as_me:$LINENO: error: ICU not found, specify with --with-icu." >&5 +echo "$as_me: error: ICU not found, specify with --with-icu." >&2;} { (exit 1); exit 1; }; } fi ###################################3 @@ -20257,6 +19908,7 @@ + # Write config.status and the Makefile ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -20388,6 +20040,20 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -20916,6 +20582,7 @@ s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s, at INSTALL_DATA@,$INSTALL_DATA,;t t +s, at CYGPATH_W@,$CYGPATH_W,;t t s, at PACKAGE@,$PACKAGE,;t t s, at VERSION@,$VERSION,;t t s, at ACLOCAL@,$ACLOCAL,;t t @@ -20923,13 +20590,17 @@ s, at AUTOMAKE@,$AUTOMAKE,;t t s, at AUTOHEADER@,$AUTOHEADER,;t t s, at MAKEINFO@,$MAKEINFO,;t t -s, at AMTAR@,$AMTAR,;t t s, at install_sh@,$install_sh,;t t s, at STRIP@,$STRIP,;t t s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +s, at mkdir_p@,$mkdir_p,;t t s, at AWK@,$AWK,;t t s, at SET_MAKE@,$SET_MAKE,;t t +s, at am__leading_dot@,$am__leading_dot,;t t +s, at AMTAR@,$AMTAR,;t t +s, at am__tar@,$am__tar,;t t +s, at am__untar@,$am__untar,;t t s, at CC@,$CC,;t t s, at CFLAGS@,$CFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t @@ -20944,6 +20615,8 @@ s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t 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 build@,$build,;t t s, at build_cpu@,$build_cpu,;t t s, at build_vendor@,$build_vendor,;t t @@ -20964,6 +20637,8 @@ s, at CXXFLAGS@,$CXXFLAGS,;t t s, at ac_ct_CXX@,$ac_ct_CXX,;t t s, at CXXDEPMODE@,$CXXDEPMODE,;t t +s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t +s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t s, at CXXCPP@,$CXXCPP,;t t s, at F77@,$F77,;t t s, at FFLAGS@,$FFLAGS,;t t @@ -20972,6 +20647,7 @@ s, at APR_CONFIG@,$APR_CONFIG,;t t s, at APXS@,$APXS,;t t s, at PKG_CONFIG@,$PKG_CONFIG,;t t +s, at ICU_CONFIG@,$ICU_CONFIG,;t t s, at apr_inc@,$apr_inc,;t t s, at apache_inc@,$apache_inc,;t t s, at apache_conf@,$apache_conf,;t t @@ -20981,6 +20657,7 @@ s, at nspr_lib@,$nspr_lib,;t t s, at ldapsdk_inc@,$ldapsdk_inc,;t t s, at ldapsdk_lib@,$ldapsdk_lib,;t t +s, at ldapsdk_ver@,$ldapsdk_ver,;t t s, at adminutil_inc@,$adminutil_inc,;t t s, at adminutil_lib@,$adminutil_lib,;t t s, at adminutil_ver@,$adminutil_ver,;t t @@ -21367,27 +21044,21 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue Index: configure.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- configure.in 9 Mar 2006 17:28:05 -0000 1.16 +++ configure.in 5 Oct 2006 23:04:57 -0000 1.17 @@ -163,7 +163,8 @@ if test -e "$withval"/include/ldap.h -a -d "$withval"/lib then AC_MSG_RESULT([using $withval]) - LDAPSDKDIR=$withval + LDAPSDKDIR="$withval" + LDAPSDKLIBDIR="$withval/lib" ldapsdk_inc="-I$LDAPSDKDIR/include" ldapsdk_lib="-L$LDAPSDKDIR/lib" else @@ -195,6 +196,7 @@ if test -d "$withval" then AC_MSG_RESULT([using $withval]) + LDAPSDKLIBDIR="$withval" ldapsdk_lib="-L$withval" else echo @@ -210,9 +212,14 @@ AC_MSG_CHECKING(for mozldap with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozldap; then - nspr_inc=`$PKG_CONFIG --cflags-only-I mozldap` - nspr_lib=`$PKG_CONFIG --libs-only-L mozldap` + if $PKG_CONFIG --exists mozldap6; then + ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6` + ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6` + ldapsdk_ver=60 + elif $PKG_CONFIG --exists mozldap; then + ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap` + ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap` + ldapsdk_ver=50 else AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) fi @@ -222,6 +229,16 @@ AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) fi +if test -z "$ldapsdk_ver" ; then + # figure out version of ldapsdk + for file in $LDAPSDKLIBDIR/libldap??.so* ; do + case $file in + *libldap60.so*) ldapsdk_ver=60 ; break ;; + *) ldapsdk_ver=50 ;; + esac + done +fi + AC_CHECKING(for ADMINUTIL) # check for --with-adminutil @@ -292,23 +309,30 @@ ], AC_MSG_RESULT(no)) -# if ADMINUTIL is not found yet, try pkg-config +# if ICU is not found yet, try pkg-config # last resort -if test -z "$adminutil_lib"; then +if test -z "$icu_lib"; then AC_MSG_CHECKING(for icu with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) + AC_PATH_PROG(ICU_CONFIG, icu-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists icu; then icu_lib=`$PKG_CONFIG --libs-only-L icu` - else - AC_MSG_ERROR([ADMINUTIL not found, specify with --with-icu.]) fi fi + if test -z "$icu_lib" ; then + if test -n "$ICU_CONFIG" ; then + icu_lib=`$ICU_CONFIG --ldflags-searchpath` + fi + fi + if test -z "$icu_lib" ; then + AC_MSG_ERROR([ICU not found, specify with --with-icu.]) + fi fi -if test -z "$adminutil_lib"; then - AC_MSG_ERROR([ADMINUTIL not found, specify with --with-icu.]) +if test -z "$icu_lib"; then + AC_MSG_ERROR([ICU not found, specify with --with-icu.]) fi ###################################3 AC_CHECKING(for NSS) @@ -387,6 +411,7 @@ AC_SUBST(nspr_lib) AC_SUBST(ldapsdk_inc) AC_SUBST(ldapsdk_lib) +AC_SUBST(ldapsdk_ver) AC_SUBST(adminutil_inc) AC_SUBST(adminutil_lib) AC_SUBST(adminutil_ver) Index: depcomp =================================================================== RCS file: /cvs/dirsec/mod_admserv/depcomp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- depcomp 20 Jun 2005 19:26:10 -0000 1.1.1.1 +++ depcomp 5 Oct 2006 23:04:57 -0000 1.2 @@ -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 . 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/mod_admserv/install-sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- install-sh 20 Jun 2005 19:26:12 -0000 1.1.1.1 +++ install-sh 5 Oct 2006 23:04:57 -0000 1.2 @@ -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/mod_admserv/ltmain.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ltmain.sh 30 Jan 2006 21:57:15 -0000 1.2 +++ ltmain.sh 5 Oct 2006 23:04:57 -0000 1.3 @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.23a -TIMESTAMP=" (1.1220.2.375 2006/01/23 18:34:25)" +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. @@ -196,13 +196,7 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{ - / I /{ - s,.*,import, - p - q - } - }'` + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -462,7 +456,7 @@ --version) $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" $echo - $echo "Copyright (C) 2006 Free Software Foundation, Inc." + $echo "Copyright (C) 2005 Free Software Foundation, Inc." $echo "This is free software; see the source for copying conditions. There is NO" $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? @@ -764,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/"` Index: missing =================================================================== RCS file: /cvs/dirsec/mod_admserv/missing,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- missing 20 Jun 2005 19:26:09 -0000 1.1.1.1 +++ missing 5 Oct 2006 23:04:57 -0000 1.2 @@ -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 , 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 ." - 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: mkinstalldirs =================================================================== RCS file: /cvs/dirsec/mod_admserv/mkinstalldirs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- mkinstalldirs 20 Jun 2005 19:25:13 -0000 1.1.1.1 +++ mkinstalldirs 5 Oct 2006 23:04:57 -0000 1.2 @@ -1,29 +1,56 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman + +scriptversion=2005-06-29.22 + +# Original author: Noah Friedman # Created: 1993-05-16 -# Public domain +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . errstatus=0 -dirmode="" +dirmode= usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." # process command line arguments while test $# -gt 0 ; do - case "${1}" in - -h | --help | --h* ) # -h for help - echo "${usage}" 1>&2; exit 0 ;; - -m ) # -m PERM arg - shift - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } - dirmode="${1}" - shift ;; - -- ) shift; break ;; # stop option processing - -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option - * ) break ;; # first non-opt arg - esac + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac done for file @@ -36,64 +63,96 @@ done case $# in -0) exit 0 ;; + 0) exit 0 ;; esac +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. case $dirmode in -'') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi ;; -*) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi ;; + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; esac for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr fi fi - fi + fi + fi - pathcomp="$pathcomp/" - done + pathcomp=$pathcomp/ + done done exit $errstatus # Local Variables: # mode: shell-script -# sh-indentation: 3 +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" # End: -# mkinstalldirs ends here From fedora-directory-commits at redhat.com Thu Oct 5 23:22:22 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 5 Oct 2006 16:22:22 -0700 Subject: [Fedora-directory-commits] mod_admserv configure, 1.20, 1.21 configure.in, 1.17, 1.18 Message-ID: <200610052322.k95NMMZl006620@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6601 Modified Files: configure configure.in Log Message: fix comment Index: configure =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- configure 5 Oct 2006 23:04:56 -0000 1.20 +++ configure 5 Oct 2006 23:22:19 -0000 1.21 @@ -19499,7 +19499,8 @@ fi if test -z "$ldapsdk_ver" ; then - # figure out version of ldapsdk + # figure out version of ldapsdk - if we find a 60 version, break, use it + # otherwise, keep looking for file in $LDAPSDKLIBDIR/libldap??.so* ; do case $file in *libldap60.so*) ldapsdk_ver=60 ; break ;; Index: configure.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- configure.in 5 Oct 2006 23:04:57 -0000 1.17 +++ configure.in 5 Oct 2006 23:22:19 -0000 1.18 @@ -230,7 +230,8 @@ fi if test -z "$ldapsdk_ver" ; then - # figure out version of ldapsdk + # figure out version of ldapsdk - if we find a 60 version, break, use it + # otherwise, keep looking for file in $LDAPSDKLIBDIR/libldap??.so* ; do case $file in *libldap60.so*) ldapsdk_ver=60 ; break ;; From fedora-directory-commits at redhat.com Sat Oct 7 03:20:39 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 6 Oct 2006 20:20:39 -0700 Subject: [Fedora-directory-commits] ldapserver nsdefs.mk, 1.18, 1.19 component_versions.mk, 1.51, 1.52 Message-ID: <200610070320.k973Kdb6012317@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12298 Modified Files: nsdefs.mk component_versions.mk Log Message: update internal builds to use latest components Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nsdefs.mk 6 Sep 2006 20:39:29 -0000 1.18 +++ nsdefs.mk 7 Oct 2006 03:20:36 -0000 1.19 @@ -120,7 +120,7 @@ endif # !BUILD_JAVA_CODE NSPR_SUF=20 -LDAP_SUF=50 +LDAP_SUF=60 IS_DIR_LITE=false Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- component_versions.mk 22 Sep 2006 20:16:27 -0000 1.51 +++ component_versions.mk 7 Oct 2006 03:20:36 -0000 1.52 @@ -57,7 +57,7 @@ # SECURITY (NSS) LIBRARY ifndef SECURITY_RELDATE - SECURITY_RELDATE = NSS_3_11_1_RTM + SECURITY_RELDATE = NSS_3_11_3_RTM endif # LIBDB @@ -76,7 +76,7 @@ # LDAP SDK ifndef LDAP_RELDATE - LDAP_RELDATE = v5.17-sun-merge + LDAP_RELDATE = v6.0.0 endif ifndef LDAPCOMP_DIR LDAPCOMP_DIR=ldapcsdk @@ -166,7 +166,7 @@ endif ifndef PERLDAP_VERSION - PERLDAP_VERSION=1.5/20060915 + PERLDAP_VERSION=1.5/20061006 endif ifndef JSS_COMP From fedora-directory-commits at redhat.com Mon Oct 9 15:06:19 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 08:06:19 -0700 Subject: [Fedora-directory-commits] setuputil component_versions.mk,1.4,1.5 Message-ID: <200610091506.k99F6JCe010425@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10408 Modified Files: component_versions.mk Log Message: use new ldapcsdk 6.0.0; upgrade other components Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/setuputil/component_versions.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- component_versions.mk 15 Jun 2006 01:27:34 -0000 1.4 +++ component_versions.mk 9 Oct 2006 15:06:17 -0000 1.5 @@ -34,12 +34,12 @@ # naming scheme. # NSPR ifndef NSPR_RELDATE - NSPR_RELDATE = v4.6.2 + NSPR_RELDATE = v4.6.3 endif # SECURITY (NSS) LIBRARY ifndef SECURITY_RELDATE - SECURITY_RELDATE = NSS_3_11_1_RTM + SECURITY_RELDATE = NSS_3_11_3_RTM endif # DBM Library @@ -49,13 +49,13 @@ # LDAP SDK ifndef LDAP_RELDATE - LDAP_RELDATE = v5.17 + LDAP_RELDATE = v6.0.0 endif ifndef LDAPCOMP_DIR - LDAPCOMP_DIR=ldapsdk50 + LDAPCOMP_DIR=ldapcsdk endif ifndef LDAP_SUF - LDAP_SUF=50 + LDAP_SUF=60 endif # infozip utilities @@ -65,5 +65,5 @@ # server core ifndef SVRCORE_RELDATE - SVRCORE_RELDATE = SVRCORE_4_0_RTM + SVRCORE_RELDATE = SVRCORE_4_0_1_RTM endif From fedora-directory-commits at redhat.com Mon Oct 9 15:08:23 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 08:08:23 -0700 Subject: [Fedora-directory-commits] adminutil component_versions.mk,1.5,1.6 Message-ID: <200610091508.k99F8NcA010573@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10556 Modified Files: component_versions.mk Log Message: use new ldapcsdk 6.0.0; upgrade other components Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/adminutil/component_versions.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- component_versions.mk 15 Jun 2006 01:26:02 -0000 1.5 +++ component_versions.mk 9 Oct 2006 15:08:20 -0000 1.6 @@ -34,23 +34,23 @@ # naming scheme. # NSPR ifndef NSPR_RELDATE - NSPR_RELDATE = v4.6.2 + NSPR_RELDATE = v4.6.3 endif # SECURITY (NSS) LIBRARY ifndef SECURITY_RELDATE - SECURITY_RELDATE = NSS_3_11_1_RTM + SECURITY_RELDATE = NSS_3_11_3_RTM endif # LDAP SDK ifndef LDAP_RELDATE - LDAP_RELDATE = v5.17 + LDAP_RELDATE = v6.0.0 endif ifndef LDAPCOMP_DIR - LDAPCOMP_DIR=ldapsdk50 + LDAPCOMP_DIR=ldapcsdk endif ifndef LDAP_SUF - LDAP_SUF=50 + LDAP_SUF=60 endif # infozip utilities From fedora-directory-commits at redhat.com Mon Oct 9 15:21:11 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 08:21:11 -0700 Subject: [Fedora-directory-commits] adminserver components.mk, 1.53, 1.54 nsconfig.mk, 1.31, 1.32 Message-ID: <200610091521.k99FLBrn010739@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10720 Modified Files: components.mk nsconfig.mk Log Message: use new ldapcsdk 6.0.0; upgrade other components Index: components.mk =================================================================== RCS file: /cvs/dirsec/adminserver/components.mk,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- components.mk 29 Sep 2006 18:25:06 -0000 1.53 +++ components.mk 9 Oct 2006 15:21:09 -0000 1.54 @@ -54,7 +54,7 @@ # NSPR Library ############################################ -NSPR_RELDATE = v4.6.2 +NSPR_RELDATE = v4.6.3 NSPR_NSOBJDIR=$(NSOBJDIR_NAME) @@ -85,7 +85,7 @@ # SECURITY LIBRARY ################################################ -SECURITY_RELDATE = NSS_3_11_1_RTM +SECURITY_RELDATE = NSS_3_11_3_RTM ifeq ($(INT_NSS), 1) BASE_NSS = $(INT_DIR)/nss/$(SECURITY_RELDATE) @@ -235,14 +235,14 @@ # LDAP C SDK Library ############################################################# -LDAP_RELDATE = v5.17 -LDAP_SUF = 50 +LDAP_RELDATE = v6.0.0 +LDAP_SUF = 60 LDAP_VERSION = $(LDAP_RELDATE) ifeq ($(INT_LDAPSDK), 1) -BASE_LDAPSDK = $(INT_DIR)/ldapsdk$(LDAP_SUF)/$(LDAP_VERSION)/$(NSOBJDIR_NAME) +BASE_LDAPSDK = $(INT_DIR)/ldapcsdk/$(LDAP_VERSION)/$(NSOBJDIR_NAME) else -BASE_LDAPSDK = $(COMPONENTS_DIR)/ldapsdk$(LDAP_SUF)/$(LDAP_VERSION)/$(NSOBJDIR_NAME) +BASE_LDAPSDK = $(COMPONENTS_DIR)/ldapcsdk/$(LDAP_VERSION)/$(NSOBJDIR_NAME) endif $(LIBLDAP): Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- nsconfig.mk 29 Sep 2006 18:25:06 -0000 1.31 +++ nsconfig.mk 9 Oct 2006 15:21:09 -0000 1.32 @@ -840,7 +840,7 @@ # LDAPSDK ####################################### -LDAP_LIB_VERSION = 50 +LDAP_LIB_VERSION = 60 ifdef LDAPSDK_SOURCE_ROOT LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib LDAPSDK_INCLUDE = $(LDAPSDK_SOURCE_ROOT)/dist/public/ldap From fedora-directory-commits at redhat.com Mon Oct 9 20:39:01 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 13:39:01 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw/html/manual dn.htm, 1.4, 1.5 filters.htm, 1.4, 1.5 intro.htm, 1.4, 1.5 Message-ID: <200610092039.k99Kd1DI029240@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/manual In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/html/manual Modified Files: dn.htm filters.htm intro.htm Log Message: Bug(s) fixed: 202889: Bug Description: Branding: Netscape Directory Server Gateway Reviewed by: nkinder (Thanks!) Fix Description: There were quite a few places in the dsgw/phonebook that referred to Netscape Directory Server. These have been removed. Nathan found a couple of places where I missed some netscape.com URLs, and suggested I remove references to Collabra server. Platforms tested: FC5 Flag Day: no Doc impact: no Index: dn.htm =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/manual/dn.htm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dn.htm 19 Apr 2005 22:07:16 -0000 1.4 +++ dn.htm 9 Oct 2006 20:38:54 -0000 1.5 @@ -60,7 +60,7 @@ wish to use. The only caveat is that if schema checking is turned on, then the attributes must be recognized by the Directory Server (if you do not know whether schema checking is turned on in the server, contact your directory -manager, or consult the Netscape Directory Server Administrator's Guide +manager, or consult the Fedora Directory Server Administrator's Guide for more information).

Traditionally, a DN consists of:

Index: filters.htm =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/manual/filters.htm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- filters.htm 19 Apr 2005 22:07:16 -0000 1.4 +++ filters.htm 9 Oct 2006 20:38:54 -0000 1.5 @@ -495,7 +495,7 @@

Your administrator can configure these settings. -For more detailed information on the searching algorithm, see the Netscape +For more detailed information on the searching algorithm, see the Fedora Directory Server Administrator's Guide.

The rest of this section explains how approximate Index: intro.htm =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/manual/intro.htm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- intro.htm 19 Apr 2005 22:07:16 -0000 1.4 +++ intro.htm 9 Oct 2006 20:38:54 -0000 1.5 @@ -37,14 +37,14 @@ --- END COPYRIGHT BLOCK --- --> -Introduction to the Netscape Directory Server Interface +Introduction to the Fedora Directory Server Interface

Introduction to the Directory Server Interface

-

The Netscape Directory Server is a robust, scalable server for storing, querying, and +

The Fedora Directory Server is a robust, scalable server for storing, querying, and managing an enterprise-wide directory of users and information. Using the Directory Server, corporate IS organizations can manage information from a single point of control, and employees can retrieve this information from multiple network locations.

From fedora-directory-commits at redhat.com Mon Oct 9 20:39:02 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 13:39:02 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw/userhtml index.html, 1.4, 1.5 index.lst, 1.4, 1.5 Message-ID: <200610092039.k99Kd20D029247@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw/userhtml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/userhtml Modified Files: index.html index.lst Log Message: Bug(s) fixed: 202889: Bug Description: Branding: Netscape Directory Server Gateway Reviewed by: nkinder (Thanks!) Fix Description: There were quite a few places in the dsgw/phonebook that referred to Netscape Directory Server. These have been removed. Nathan found a couple of places where I missed some netscape.com URLs, and suggested I remove references to Collabra server. Platforms tested: FC5 Flag Day: no Doc impact: no Index: index.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/userhtml/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- index.html 19 Apr 2005 22:07:18 -0000 1.4 +++ index.html 9 Oct 2006 20:38:59 -0000 1.5 @@ -36,7 +36,7 @@ All rights reserved. --- END COPYRIGHT BLOCK --- --> -Netscape User Environment +Fedora User Environment Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989 Modified Files: Versiongw.c dbtdsgw.h Log Message: Bug(s) fixed: 202889: Bug Description: Branding: Netscape Directory Server Gateway Reviewed by: nkinder (Thanks!) Fix Description: There were quite a few places in the dsgw/phonebook that referred to Netscape Directory Server. These have been removed. Nathan found a couple of places where I missed some netscape.com URLs, and suggested I remove references to Collabra server. Platforms tested: FC5 Flag Day: no Doc impact: no Index: Versiongw.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Versiongw.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Versiongw.c 19 Apr 2005 22:07:01 -0000 1.4 +++ Versiongw.c 9 Oct 2006 20:38:37 -0000 1.5 @@ -49,4 +49,4 @@ #define DSGW_VER_STR PRODUCTTEXT #endif -char *Versionstr = "Netscape-Directory-Gateway/"DSGW_VER_STR; +char *Versionstr = "Fedora-Directory-Gateway/"DSGW_VER_STR; Index: dbtdsgw.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dbtdsgw.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dbtdsgw.h 11 Apr 2006 02:14:32 -0000 1.5 +++ dbtdsgw.h 9 Oct 2006 20:38:37 -0000 1.6 @@ -459,7 +459,7 @@ ResDef( DBT_missingArgumentForBindpwDirectiv_, 408, "Missing argument for \"bindpw\" directive\n" ) ResDef( DBT_badFilenameForBinddnfileDirecti_, 409, "The binddn file must be specified with a full path and cannot exist under the dsgw directory\n" ) ResDef (DBT_wrongPlaceForBinddnDirectiv_, 410, "The bind information should not be in the main configuration file. Please put it in a separate file outside of the dsgw directory\n") - ResDef( DBT_NotWillingToExecute_, 411, "The directory server gateway is not available for the restricted installation. To use the gateway upgrade to the full version of the Netscape Directory Server.\n" ) + ResDef( DBT_NotWillingToExecute_, 411, "The directory server gateway is not available for the restricted installation. To use the gateway upgrade to the full version of the Fedora Directory Server.\n" ) ResDef( DBT_missingArgumentForOrgChartURLDirectiv_, 412, "Missing argument for \"url-orgchart-base\" directive\n" )/*extracted from config.c*/ ResDef( DBT_missingArgumentForOrgChartSearchAttr_ , 413, "Missing argument for \"orgchart-attrib-farleft-rdn\" directive\n" )/*extracted from config.c*/ ResDef( DBT_theCharsetIsNotSupported , 414, "The charset is not supported\n" ) From fedora-directory-commits at redhat.com Mon Oct 9 20:38:41 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 13:38:41 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw/config csearch.html, 1.4, 1.5 dsgw_adm.conf, 1.4, 1.5 dsgwfilter_adm.conf, 1.4, 1.5 newentry.html, 1.4, 1.5 search.html, 1.4, 1.5 Message-ID: <200610092039.k99KdB2G029260@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw/config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/config Modified Files: csearch.html dsgw_adm.conf dsgwfilter_adm.conf newentry.html search.html Log Message: Bug(s) fixed: 202889: Bug Description: Branding: Netscape Directory Server Gateway Reviewed by: nkinder (Thanks!) Fix Description: There were quite a few places in the dsgw/phonebook that referred to Netscape Directory Server. These have been removed. Nathan found a couple of places where I missed some netscape.com URLs, and suggested I remove references to Collabra server. Platforms tested: FC5 Flag Day: no Doc impact: no Index: csearch.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/csearch.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csearch.html 19 Apr 2005 22:07:05 -0000 1.4 +++ csearch.html 9 Oct 2006 20:38:38 -0000 1.5 @@ -38,7 +38,7 @@ -Netscape Directory Server Gateway: Advanced Search +Fedora Directory Server Gateway: Advanced Search Index: dsgw_adm.conf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/dsgw_adm.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsgw_adm.conf 19 Apr 2005 22:07:05 -0000 1.4 +++ dsgw_adm.conf 9 Oct 2006 20:38:38 -0000 1.5 @@ -61,8 +61,7 @@ # Attribute Value Sets (used with DS_ATTRVAL_SET directives) # attrvset HANDLE VALUE PREFIX SUFFIX # -attrvset CAL news "" "Netscape Collabra Server" -attrvset CAL slapd "" "Netscape Directory Server" +attrvset CAL slapd "" "Fedora Directory Server" # Template Set definitions Index: dsgwfilter_adm.conf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/dsgwfilter_adm.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsgwfilter_adm.conf 19 Apr 2005 22:07:05 -0000 1.4 +++ dsgwfilter_adm.conf 9 Oct 2006 20:38:38 -0000 1.5 @@ -67,7 +67,7 @@ # if it is included. # -# Directory Server gateway - for Netscape Admin Server +# Directory Server gateway - for Fedora Admin Server # "dsgw-people" Index: newentry.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/newentry.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- newentry.html 19 Apr 2005 22:07:06 -0000 1.4 +++ newentry.html 9 Oct 2006 20:38:38 -0000 1.5 @@ -38,7 +38,7 @@ -Netscape Directory Server Gateway: New Entry +Fedora Directory Server Gateway: New Entry Index: search.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/search.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- search.html 19 Apr 2005 22:07:06 -0000 1.4 +++ search.html 9 Oct 2006 20:38:38 -0000 1.5 @@ -38,7 +38,7 @@ -Netscape Directory Server Gateway: Standard Search +Fedora Directory Server Gateway: Standard Search From fedora-directory-commits at redhat.com Mon Oct 9 20:38:40 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 13:38:40 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw/admhtml display-licensed-user.html, 1.4, 1.5 index.lst, 1.4, 1.5 Message-ID: <200610092039.k99KdAYQ029255@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw/admhtml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/admhtml Modified Files: display-licensed-user.html index.lst Log Message: Bug(s) fixed: 202889: Bug Description: Branding: Netscape Directory Server Gateway Reviewed by: nkinder (Thanks!) Fix Description: There were quite a few places in the dsgw/phonebook that referred to Netscape Directory Server. These have been removed. Nathan found a couple of places where I missed some netscape.com URLs, and suggested I remove references to Collabra server. Platforms tested: FC5 Flag Day: no Doc impact: no Index: display-licensed-user.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/admhtml/display-licensed-user.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- display-licensed-user.html 19 Apr 2005 22:07:04 -0000 1.4 +++ display-licensed-user.html 9 Oct 2006 20:38:38 -0000 1.5 @@ -37,7 +37,7 @@ --- END COPYRIGHT BLOCK --- --> - + @@ -63,7 +63,7 @@
-Netscape Client Access License Information +Fedora Client Access License Information Index: index.lst =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/admhtml/index.lst,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- index.lst 19 Apr 2005 22:07:04 -0000 1.4 +++ index.lst 9 Oct 2006 20:38:38 -0000 1.5 @@ -36,7 +36,7 @@ ; All rights reserved. ; --- END COPYRIGHT BLOCK --- ; -; Netscape admin index page master list +; Fedora admin index page master list ; ; Lines beginning with a ';' are comments ; Lines beginning with '--' are dividers: From fedora-directory-commits at redhat.com Mon Oct 9 20:38:46 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 13:38:46 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw/config/de dsgw_adm.conf, 1.4, 1.5 newentry.html, 1.4, 1.5 search.html, 1.4, 1.5 Message-ID: <200610092039.k99KdGsa029267@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/de In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/config/de Modified Files: dsgw_adm.conf newentry.html search.html Log Message: Bug(s) fixed: 202889: Bug Description: Branding: Netscape Directory Server Gateway Reviewed by: nkinder (Thanks!) Fix Description: There were quite a few places in the dsgw/phonebook that referred to Netscape Directory Server. These have been removed. Nathan found a couple of places where I missed some netscape.com URLs, and suggested I remove references to Collabra server. Platforms tested: FC5 Flag Day: no Doc impact: no Index: dsgw_adm.conf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/de/dsgw_adm.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsgw_adm.conf 19 Apr 2005 22:07:07 -0000 1.4 +++ dsgw_adm.conf 9 Oct 2006 20:38:39 -0000 1.5 @@ -61,8 +61,7 @@ # Attribute Value Sets (used with DS_ATTRVAL_SET directives) # attrvset HANDLE VALUE PREFIX SUFFIX # -attrvset CAL news "" "Netscape Collabra Server" -attrvset CAL slapd "" "Netscape Directory Server" +attrvset CAL slapd "" "Fedora Directory Server" # Template Set definitions Index: newentry.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/de/newentry.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- newentry.html 19 Apr 2005 22:07:07 -0000 1.4 +++ newentry.html 9 Oct 2006 20:38:39 -0000 1.5 @@ -38,7 +38,7 @@ -Netscape Directory Server Gateway Neuer Eintrag +Fedora Directory Server Gateway Neuer Eintrag Index: search.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/de/search.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- search.html 19 Apr 2005 22:07:07 -0000 1.4 +++ search.html 9 Oct 2006 20:38:39 -0000 1.5 @@ -38,7 +38,7 @@ -Netscape Directory Server Gateway: Standardsuche +Fedora Directory Server Gateway: Standardsuche From fedora-directory-commits at redhat.com Mon Oct 9 20:38:47 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 13:38:47 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw/config/es csearch.html, 1.4, 1.5 dsgw_adm.conf, 1.4, 1.5 dsgwfilter_adm.conf, 1.4, 1.5 newentry.html, 1.4, 1.5 search.html, 1.4, 1.5 Message-ID: <200610092039.k99KdHhH029274@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/es In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/config/es Modified Files: csearch.html dsgw_adm.conf dsgwfilter_adm.conf newentry.html search.html Log Message: Bug(s) fixed: 202889: Bug Description: Branding: Netscape Directory Server Gateway Reviewed by: nkinder (Thanks!) Fix Description: There were quite a few places in the dsgw/phonebook that referred to Netscape Directory Server. These have been removed. Nathan found a couple of places where I missed some netscape.com URLs, and suggested I remove references to Collabra server. Platforms tested: FC5 Flag Day: no Doc impact: no Index: csearch.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/es/csearch.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csearch.html 19 Apr 2005 22:07:08 -0000 1.4 +++ csearch.html 9 Oct 2006 20:38:44 -0000 1.5 @@ -38,7 +38,7 @@ -Netscape Directory Server Gateway : Advanced Search +Fedora Directory Server Gateway : Advanced Search Index: dsgw_adm.conf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/es/dsgw_adm.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsgw_adm.conf 19 Apr 2005 22:07:08 -0000 1.4 +++ dsgw_adm.conf 9 Oct 2006 20:38:44 -0000 1.5 @@ -61,8 +61,7 @@ # Attribute Value Sets (used with DS_ATTRVAL_SET directives) # attrvset HANDLE VALUE PREFIX SUFFIX # -attrvset CAL news "" "Netscape Collabra Server" -attrvset CAL slapd "" "Netscape Directory Server" +attrvset CAL slapd "" "Fedora Directory Server" # Template Set definitions Index: dsgwfilter_adm.conf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/es/dsgwfilter_adm.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsgwfilter_adm.conf 19 Apr 2005 22:07:08 -0000 1.4 +++ dsgwfilter_adm.conf 9 Oct 2006 20:38:44 -0000 1.5 @@ -67,7 +67,7 @@ # if it is included. # -# Directory Server gateway - for Netscape Admin Server +# Directory Server gateway - for Fedora Admin Server # "dsgw-people" Index: newentry.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/es/newentry.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- newentry.html 19 Apr 2005 22:07:08 -0000 1.4 +++ newentry.html 9 Oct 2006 20:38:45 -0000 1.5 @@ -38,7 +38,7 @@ -Pasarela de Netscape Directory Server: Nueva entrada +Pasarela de Fedora Directory Server: Nueva entrada Index: search.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/es/search.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- search.html 19 Apr 2005 22:07:08 -0000 1.4 +++ search.html 9 Oct 2006 20:38:45 -0000 1.5 @@ -38,7 +38,7 @@ -Pasarela de Netscape Directory Server: Standard Search +Pasarela de Fedora Directory Server: Standard Search From fedora-directory-commits at redhat.com Mon Oct 9 20:38:53 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 13:38:53 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw/config/ja csearch.html, 1.4, 1.5 dsgw_adm.conf, 1.4, 1.5 dsgwfilter_adm.conf, 1.4, 1.5 newentry.html, 1.4, 1.5 search.html, 1.4, 1.5 Message-ID: <200610092039.k99KdNH9029288@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/ja In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/config/ja Modified Files: csearch.html dsgw_adm.conf dsgwfilter_adm.conf newentry.html search.html Log Message: Bug(s) fixed: 202889: Bug Description: Branding: Netscape Directory Server Gateway Reviewed by: nkinder (Thanks!) Fix Description: There were quite a few places in the dsgw/phonebook that referred to Netscape Directory Server. These have been removed. Nathan found a couple of places where I missed some netscape.com URLs, and suggested I remove references to Collabra server. Platforms tested: FC5 Flag Day: no Doc impact: no Index: csearch.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/ja/csearch.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csearch.html 19 Apr 2005 22:07:10 -0000 1.4 +++ csearch.html 9 Oct 2006 20:38:51 -0000 1.5 @@ -38,7 +38,7 @@ -Netscape Directory Server Gateway: Advanced Search +Fedora Directory Server Gateway: Advanced Search Index: dsgw_adm.conf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/ja/dsgw_adm.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsgw_adm.conf 19 Apr 2005 22:07:10 -0000 1.4 +++ dsgw_adm.conf 9 Oct 2006 20:38:51 -0000 1.5 @@ -61,8 +61,7 @@ # Attribute Value Sets (used with DS_ATTRVAL_SET directives) # attrvset HANDLE VALUE PREFIX SUFFIX # -attrvset CAL news "" "Netscape Collabra Server" -attrvset CAL slapd "" "Netscape Directory Server" +attrvset CAL slapd "" "Fedora Directory Server" # Template Set definitions Index: dsgwfilter_adm.conf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dsgwfilter_adm.conf 19 Apr 2005 22:07:10 -0000 1.4 +++ dsgwfilter_adm.conf 9 Oct 2006 20:38:51 -0000 1.5 @@ -67,7 +67,7 @@ # if it is included. # -# Directory Server gateway - for Netscape Admin Server +# Directory Server gateway - for Fedora Admin Server # "dsgw-people" Index: newentry.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/ja/newentry.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- newentry.html 19 Apr 2005 22:07:10 -0000 1.4 +++ newentry.html 9 Oct 2006 20:38:51 -0000 1.5 @@ -38,7 +38,7 @@ -Netscape Directory Server Gateway: New Entry +Fedora Directory Server Gateway: New Entry Index: search.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/config/ja/search.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- search.html 19 Apr 2005 22:07:10 -0000 1.4 +++ search.html 9 Oct 2006 20:38:51 -0000 1.5 @@ -38,7 +38,7 @@ -Netscape Directory Server Gateway: Standard Search +Fedora Directory Server Gateway: Standard Search From fedora-directory-commits at redhat.com Mon Oct 9 20:38:54 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 9 Oct 2006 13:38:54 -0700 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw/html/es auth.html, 1.4, 1.5 authroot.html, 1.4, 1.5 authtitle.html, 1.4, 1.5 csearchtitle.html, 1.4, 1.5 greeting.html, 1.4, 1.5 index.html, 1.4, 1.5 maintitle.html, 1.4, 1.5 newentrytitle.html, 1.4, 1.5 searchtitle.html, 1.4, 1.5 Message-ID: <200610092039.k99KdO55029303@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/es In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989/html/es Modified Files: auth.html authroot.html authtitle.html csearchtitle.html greeting.html index.html maintitle.html newentrytitle.html searchtitle.html Log Message: Bug(s) fixed: 202889: Bug Description: Branding: Netscape Directory Server Gateway Reviewed by: nkinder (Thanks!) Fix Description: There were quite a few places in the dsgw/phonebook that referred to Netscape Directory Server. These have been removed. Nathan found a couple of places where I missed some netscape.com URLs, and suggested I remove references to Collabra server. Platforms tested: FC5 Flag Day: no Doc impact: no Index: auth.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/es/auth.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- auth.html 19 Apr 2005 22:07:13 -0000 1.4 +++ auth.html 9 Oct 2006 20:38:52 -0000 1.5 @@ -38,7 +38,7 @@ -Pasarela de Netscape Directory Server: Autenticar +Pasarela de Fedora Directory Server: Autenticar @@ -49,6 +49,6 @@ <H3>Es necesario un navegador que admita marcos</H3> -Lo siento, pero para poder usar la Pasarela de Netscape Directory Server, debe emplear un navegador que admita formularios HTML y JavaScript, como Netscape Navigator versi&oacute;n 3 o posterior. Para conseguir Navigator, visite la <A HREF="http://home.es.netscape.com/es/">P&aacute;gina principal de Netscape</A>. +Lo siento, pero para poder usar la Pasarela de Fedora Directory Server, debe emplear un navegador que admita formularios HTML y JavaScript, como Fedora Navigator versi&oacute;n 3 o posterior. Para conseguir Navigator, visite la <A HREF="http://directory.fedora.redhat.com/es/">P&aacute;gina principal de Fedora</A>. Index: authroot.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/es/authroot.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- authroot.html 19 Apr 2005 22:07:13 -0000 1.4 +++ authroot.html 9 Oct 2006 20:38:52 -0000 1.5 @@ -38,7 +38,7 @@ -Pasarela de Netscape Directory Server: Autenticar +Pasarela de Fedora Directory Server: Autenticar @@ -48,6 +48,6 @@ <H3>Es necesario un navegador que admita marcos</H3> -Lo siento, pero para poder usar la Pasarela de Netscape Directory Server, debe emplear un navegador que admita formularios HTML y JavaScript, como Netscape Navigator versi&oacute;n 3 o posterior. Para conseguir Navigator, visite la <A HREF="http://home.es.netscape.com/es/">P&aacute;gina principal de Netscape</A>. +Lo siento, pero para poder usar la Pasarela de Fedora Directory Server, debe emplear un navegador que admita formularios HTML y JavaScript, como Fedora Navigator versi&oacute;n 3 o posterior. Para conseguir Navigator, visite la <A HREF="http://directory.fedora.redhat.com/es/">P&aacute;gina principal de Fedora</A>. Index: authtitle.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/es/authtitle.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- authtitle.html 19 Apr 2005 22:07:13 -0000 1.4 +++ authtitle.html 9 Oct 2006 20:38:52 -0000 1.5 @@ -37,13 +37,13 @@ --- END COPYRIGHT BLOCK --- --> -Netscape Directory Server +Fedora Directory Server Netscape Directory Server
+ ALT="Fedora Directory Server">
Index: csearchtitle.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/es/csearchtitle.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csearchtitle.html 19 Apr 2005 22:07:13 -0000 1.4 +++ csearchtitle.html 9 Oct 2006 20:38:52 -0000 1.5 @@ -37,13 +37,13 @@ --- END COPYRIGHT BLOCK --- --> -Netscape Directory Server +Fedora Directory Server Netscape Directory Server
+ ALT="Fedora Directory Server">
Index: greeting.html =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/html/es/greeting.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- greeting.html 19 Apr 2005 22:07:14 -0000 1.4 +++ greeting.html 9 Oct 2006 20:38:52 -0000 1.5 @@ -37,7 +37,7 @@ --- END COPYRIGHT BLOCK --- --> -Netscape Directory Server +Fedora Directory Server