From fedora-directory-commits at redhat.com Wed Jan 10 02:18:49 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Tue, 9 Jan 2007 21:18:49 -0500 Subject: [Fedora-directory-commits] esc/coreconf Darwin.mk,1.1.1.1,1.2 Message-ID: <200701100218.l0A2InDH004352@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/coreconf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4336 Modified Files: Darwin.mk Log Message: Fix for universal compile. Index: Darwin.mk =================================================================== RCS file: /cvs/dirsec/esc/coreconf/Darwin.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Darwin.mk 12 Jun 2006 23:39:54 -0000 1.1.1.1 +++ Darwin.mk 10 Jan 2007 02:18:47 -0000 1.2 @@ -69,6 +69,6 @@ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@ G++INCLUDES = -I/usr/include/g++ -OS_LIBS += /usr/lib/libstdc++.a -EXTRA_LIBS += /usr/lib/libstdc++.a +#OS_LIBS += /usr/lib/libstdc++.a +#EXTRA_LIBS += /usr/lib/libstdc++.a From fedora-directory-commits at redhat.com Wed Jan 10 02:19:38 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Tue, 9 Jan 2007 21:19:38 -0500 Subject: [Fedora-directory-commits] esc/src/app/xpcom/tray Makefile, 1.2, 1.3 Makefile.moz, 1.3, 1.4 Message-ID: <200701100219.l0A2JcNd004381@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xpcom/tray In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4363 Modified Files: Makefile Makefile.moz Log Message: Mac universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 13 Sep 2006 17:50:07 -0000 1.2 +++ Makefile 10 Jan 2007 02:19:36 -0000 1.3 @@ -21,17 +21,23 @@ include $(CORE_DEPTH)/coreconf/config.mk include $(CORE_DEPTH)/coreconf/rules.mk +DARWIN_LIB_NAME=librhTray.dylib + + CORE_INC=$(SOURCE_XP_DIR)/public MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla MOZ_OBJDIR=$(DIST)/xulrunner_build -ifeq ($(OS_ARCH), Darwin) -#MOZ_OBJDIR=$(MOZ_SRCDIR) -endif -ifeq ($(OS_ARCH),Linux) +UNIVERSAL_OFFSET_PPC=ppc +UNIVERSAL_OFFSET_386=i386 +MOZ_OBJDIR_PPC= +ifeq ($(OS_ARCH),Darwin) +MOZ_OBJDIR=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_386) +MOZ_OBJDIR_PPC=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_PPC) endif + all export install clean deploy args:: echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR) $@" echo $(DIST) @@ -42,6 +48,16 @@ MOZ_SRCDIR=$(MOZ_SRCDIR) \ MOZ_OBJDIR=$(MOZ_OBJDIR) \ +ifeq ($(OS_ARCH),Darwin) + echo "Darwin all" + $(MAKE) -f Makefile.moz $@ \ + OBJDIR=$(OBJDIR) \ + CORE_DIST=$(DIST) \ + CORE_INC=$(CORE_INC) \ + MOZ_SRCDIR=$(MOZ_SRCDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) +endif + libs:: $(MAKE) -f Makefile.moz libs \ @@ -49,13 +65,31 @@ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ MOZ_SRCDIR=$(MOZ_SRCDIR) \ - MOZ_OBJ_DIR=$(MOZ_OBJDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR) \ + +ifeq ($(OS_ARCH),Darwin) + echo "Darwin libs" + mkdir -p $(UNIVERSAL_OFFSET_386) + mkdir -p $(UNIVERSAL_OFFSET_PPC) + mv -n $(DARWIN_LIB_NAME) i386 + rm Makefile.in + rm *.o + $(MAKE) -f Makefile.moz libs \ + OBJDIR=$(OBJDIR) \ + CORE_DIST=$(DIST) \ + CORE_INC=$(CORE_INC) \ + MOZ_SRCDIR=$(MOZ_SRCDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) + mv $(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC) +endif +ifeq ($(OS_ARCH),Darwin) + echo "Darwin Creating UNI binary." + lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(DARWIN_LIB_NAME) +endif $(MAKE) -f Makefile.moz deploy \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ MOZ_SRCDIR=$(MOZ_SRCDIR) \ - MOZ_OBJ_DIR=$(MOZ_OBJDIR) - - + MOZ_OBJDIR=$(MOZ_OBJDIR) Index: Makefile.moz =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.moz,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.moz 25 Oct 2006 03:59:03 -0000 1.3 +++ Makefile.moz 10 Jan 2007 02:19:36 -0000 1.4 @@ -16,7 +16,9 @@ # ***** END COPYRIGHT BLOCK ***** CORE_DEPTH = ../../../.. -MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build +#MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build +#MOZ_OBJDIR=$(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build/i386 + MOZ_SRCDIR = $(CORE_DEPTH)/dist/src/mozilla DEPTH = $(MOZ_OBJDIR) topsrcdir = $(MOZ_SRCDIR) @@ -32,14 +34,17 @@ NOTIFY_CXX_FLAGS = -I$(NOTIFY_DEPTH) $(shell pkg-config --cflags glib-2.0) NOTIFY_LDFLAGS = $(shell pkg-config --libs libnotify) + NO_DIST_INSTALL = 1 ifeq ($(OS_ARCH),Linux) endif + -include $(MOZ_OBJDIR)/config/autoconf.mk -DEPLOY_OFFSET=/esc +#DEPLOY_OFFSET=/esc +DEPLOY_OFFSET=/src ifeq ($(OS_ARCH),Linux) DEPLOY_OFFSET=/src endif @@ -96,7 +101,7 @@ endif ifeq ($(OS_ARCH),Darwin) - +#OS_CXXFLAGS += -arch i386 -arch ppc CPPSRCS = \ rhMacTray.cpp \ $(NULL) @@ -135,6 +140,10 @@ clean:: rm -f Makefile.in +ifeq ($(OS_ARCH),Darwin) + rm -rf i386 + rm -rf ppc +endif deploy:: echo "Deploying" From fedora-directory-commits at redhat.com Wed Jan 10 02:20:15 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Tue, 9 Jan 2007 21:20:15 -0500 Subject: [Fedora-directory-commits] esc/src/app/xpcom Makefile, 1.2, 1.3 Makefile.moz, 1.4, 1.5 Message-ID: <200701100220.l0A2KFTb004410@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xpcom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4392 Modified Files: Makefile Makefile.moz Log Message: Mac universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 13 Sep 2006 17:50:07 -0000 1.2 +++ Makefile 10 Jan 2007 02:20:13 -0000 1.3 @@ -26,6 +26,18 @@ MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla MOZ_OBJDIR=$(DIST)/xulrunner_build +DARWIN_LIB_NAME=librhCoolKey.dylib + +UNIVERSAL_OFFSET_PPC=ppc +UNIVERSAL_OFFSET_386=i386 +MOZ_OBJDIR_PPC= +ifeq ($(OS_ARCH),Darwin) +MOZ_OBJDIR=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_386) +MOZ_OBJDIR_PPC=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_PPC) +endif + + + ifeq ($(OS_ARCH),Linux) endif @@ -39,6 +51,16 @@ MOZ_SRCDIR=$(MOZ_SRCDIR) \ MOZ_OBJDIR=$(MOZ_OBJDIR) \ +ifeq ($(OS_ARCH),Darwin) + echo "Darwin all" + $(MAKE) -f Makefile.moz $@ \ + OBJDIR=$(OBJDIR) \ + CORE_DIST=$(DIST) \ + CORE_INC=$(CORE_INC) \ + MOZ_SRCDIR=$(MOZ_SRCDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) +endif + libs:: echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR)" @@ -49,12 +71,30 @@ MOZ_SRCDIR=$(MOZ_SRCDIR) \ MOZ_OBJDIR=$(MOZ_OBJDIR) \ +ifeq ($(OS_ARCH),Darwin) + echo "Darwin libs" + mkdir -p $(UNIVERSAL_OFFSET_386) + mkdir -p $(UNIVERSAL_OFFSET_PPC) + mv -n $(DARWIN_LIB_NAME) i386 + rm Makefile.in + rm *.o + $(MAKE) -f Makefile.moz libs \ + OBJDIR=$(OBJDIR) \ + CORE_DIST=$(DIST) \ + CORE_INC=$(CORE_INC) \ + MOZ_SRCDIR=$(MOZ_SRCDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) + mv $(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC) +endif + +ifeq ($(OS_ARCH),Darwin) + echo "Darwin Creating UNI binary." + lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(DARWIN_LIB_NAME) +endif $(MAKE) -f Makefile.moz deploy \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ MOZ_SRCDIR=$(MOZ_SRCDIR) \ - MOZ_OBJDIR=$(MOZ_OBJDIR) \ - - + MOZ_OBJDIR=$(MOZ_OBJDIR) Index: Makefile.moz =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.moz,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.moz 25 Oct 2006 03:58:16 -0000 1.4 +++ Makefile.moz 10 Jan 2007 02:20:13 -0000 1.5 @@ -1,4 +1,4 @@ - +# # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. @@ -16,7 +16,7 @@ # ***** END COPYRIGHT BLOCK ***** CORE_DEPTH = ../../.. -MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build +#MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build MOZ_SRCDIR = $(CORE_DEPTH)/dist/src/mozilla DEPTH = $(MOZ_OBJDIR) topsrcdir = $(MOZ_SRCDIR) @@ -42,13 +42,14 @@ XULRUNNER_BIN_PATH = $(MOZ_OBJDIR)/dist/xulrunner XULRUNNER_EXEC = xulrunner ifeq ($(OS_ARCH), Darwin) -XULRUNNER_BIN_PATH = /Library/Frameworks/XUL.framework +XULRUNNER_BIN_PATH = $(MOZ_OBJDIR)/dist/universal/xulrunner/XUL.framework XULRUNNER_EXEC = xulrunner-bin XULRUNNER_FRAME_DEST = ESC.app/Contents/Frameworks/XUL.framework XULRUNNER_FRAME_BASE = ESC.app/Contents/Frameworks endif -DEPLOY_OFFSET=/esc +#DEPLOY_OFFSET=/esc +DEPLOY_OFFSET=/src ifeq ($(OS_ARCH),Linux) DEPLOY_OFFSET=/src @@ -66,12 +67,23 @@ XPIDL_MODULE = rhCoolKey LIBRARY_NAME = rhCoolKey + +CKY_LIB_LDD= +ifdef CKY_LIB +CKY_LIB_LDD = -L$(CKY_LIB) +endif + + ifeq ($(OS_ARCH),WINNT) -COOLKEY_LIBS = $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib $(CORE_DIST)/lib/ckyapplet.lib +COOLKEY_LIBS = $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib $(CKY_LIB_LDD) $(CORE_DIST)/lib/ckyapplet.lib TESTCPPSRCS = CoolKeyCSP.cpp MOZ_NO_DEBUG_RTL=1 else -COOLKEY_LIBS = -L$(CORE_DIST)/lib -lckymanager -lhttpchunked -lckyapplet +COOLKEY_LIBS = -L$(CORE_DIST)/lib -lhttpchunked -lckymanager $(CKY_LIB_LDD) -lckyapplet +endif + +ifeq ($(OS_ARCH),Darwin) +COOLKEY_LIBS += -lsystemStubs endif IS_COMPONENT = 1 @@ -129,6 +141,10 @@ rm -f Makefile.in rm -rf $(DEPLOY_OBJDIR) rm -rf $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/esc +ifeq ($(OS_ARCH),Darwin) + rm -rf ppc + rm -rf i386 +endif deploy: $(DEPLOY_OBJDIR) echo "deploy! on $(OS_ARCH)" From fedora-directory-commits at redhat.com Wed Jan 10 02:20:53 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Tue, 9 Jan 2007 21:20:53 -0500 Subject: [Fedora-directory-commits] esc/src/lib/NssHttpClient Makefile, 1.1.1.1, 1.2 manifest.mn, 1.2, 1.3 Message-ID: <200701100220.l0A2Krlg004439@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/NssHttpClient In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4421 Modified Files: Makefile manifest.mn Log Message: Mac universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 12 Jun 2006 23:39:53 -0000 1.1.1.1 +++ Makefile 10 Jan 2007 02:20:51 -0000 1.2 @@ -21,11 +21,13 @@ # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn + +#include manifest.mn include config.mk +include manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # @@ -68,3 +70,11 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### + +UNIVERSAL_OFFSET= +ifeq ($(OS_ARCH), Darwin) +UNIVERSAL_OFFSET=i386 +XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build/$(UNIVERSAL_OFFSET) + +DEFINES += -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk +endif Index: manifest.mn =================================================================== RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/manifest.mn,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- manifest.mn 27 Sep 2006 17:49:21 -0000 1.2 +++ manifest.mn 10 Jan 2007 02:20:51 -0000 1.3 @@ -17,6 +17,9 @@ CORE_DEPTH = ../../.. +XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build + + SYS_INC = /usr/include MODULE = httpchunked LIBRARY_NAME = $(MODULE) @@ -25,8 +28,10 @@ ifndef MOZ_OFFSET MOZ_OFFSET = mozilla-1.7.13 endif + + MAPFILE = $(OBJDIR)/httpchunked.def -DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss +DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr CPPSRCS = \ Cache.cpp \ From fedora-directory-commits at redhat.com Wed Jan 10 02:21:27 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Tue, 9 Jan 2007 21:21:27 -0500 Subject: [Fedora-directory-commits] esc/src/lib/coolkey Makefile, 1.1.1.1, 1.2 manifest.mn, 1.2, 1.3 Message-ID: <200701100221.l0A2LRHQ004468@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4450 Modified Files: Makefile manifest.mn Log Message: Mac universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 12 Jun 2006 23:39:52 -0000 1.1.1.1 +++ Makefile 10 Jan 2007 02:21:25 -0000 1.2 @@ -8,7 +8,7 @@ # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. @@ -17,57 +17,30 @@ # All rights reserved. # END COPYRIGHT BLOCK +UNIVERSAL_OFFSET_PPC=ppc +UNIVERSAL_OFFSET_386=i386 -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -include config.mk - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - +CORE_DEPTH=../../.. include $(CORE_DEPTH)/coreconf/config.mk -#only want the library -SHARED_LIBRARY= -IMPORT_LIBRARY= - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DEFINES += -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -#include config.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - include $(CORE_DEPTH)/coreconf/rules.mk -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### +libs:: +ifeq ($(OS_ARCH),Darwin) + echo "Build Darwin." + make -f Mac-universal.mk +else + echo "Build Linux or Windows." + make -f common.mk -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -ifeq ($(OS_ARCH), WINNT) -#CPPSRCS += CoolKeyCSP.cpp endif +ifeq ($(OS_ARCH),Darwin) +clean:: + echo "Cleaning." + rm -rf $(UNIVERSAL_OFFSET_PPC) + rm -rf $(UNIVERSAL_OFFSET_386) + make -f common.mk clean +endif Index: manifest.mn =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/manifest.mn,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- manifest.mn 27 Sep 2006 17:47:46 -0000 1.2 +++ manifest.mn 10 Jan 2007 02:21:25 -0000 1.3 @@ -17,6 +17,9 @@ CORE_DEPTH = ../../.. +XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build + + SYS_INC = /usr/include MODULE = ckymanager LIBRARY_NAME = $(MODULE) @@ -24,7 +27,7 @@ ifndef MOZ_OFFSET MOZ_OFFSET = mozilla-1.7.13 endif -DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss +DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr MAPFILE = $(OBJDIR)/ckymanager.def #EXTRA_LIBS += -L$(DIST)/lib -lckyapplet From fedora-directory-commits at redhat.com Wed Jan 10 02:22:28 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Tue, 9 Jan 2007 21:22:28 -0500 Subject: [Fedora-directory-commits] esc/src/lib/coolkey common.mk, NONE, 1.1 Mac-universal.mk, NONE, 1.1 Message-ID: <200701100222.l0A2MSH2004500@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4484 Added Files: common.mk Mac-universal.mk Log Message: Mac univeral binary. --- NEW FILE common.mk --- #! gmake # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### include manifest.mn include config.mk ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### include $(CORE_DEPTH)/coreconf/config.mk #only want the library SHARED_LIBRARY= IMPORT_LIBRARY= ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" DEFINES += -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" ifdef DARWIN_GCC_VERSION echo "blooie" sudo gcc_select $(GCC_VERSION) endif ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### #include config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### UNIVERSAL_OFFSET= ifeq ($(OS_ARCH), Darwin) UNIVERSAL_OFFSET=i386 XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build/$(UNIVERSAL_OFFSET) DEFINES += -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr CFLAGS += $(OSX_ARCH_FLAGS) ifdef CKY_INCLUDE CFLAGS += -I $(CKY_INCLUDE) endif endif --- NEW FILE Mac-universal.mk --- #! gmake # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK UNIVERSAL_OFFSET_PPC=ppc UNIVERSAL_OFFSET_386=i386 DARWIN_LIB_NAME=libckymanager.a CORE_DEPTH=../../.. include $(CORE_DEPTH)/coreconf/config.mk all libs: mkdir -p $(UNIVERSAL_OFFSET_PPC) mkdir -p $(UNIVERSAL_OFFSET_386) sudo gcc_select 4.0 echo "Build i386." make -f common.mk OSX_ARCH_FLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" cp $(OBJDIR)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386) make -f common.mk clean sudo gcc_select 3.3 echo "Build ppc." make -f common.mk OSX_ARCH_FLAGS="-arch ppc" CKY_INCLUDE=/usr/local/CoolKey/include cp $(OBJDIR)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC) lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(OBJDIR)/$(DARWIN_LIB_NAME) ranlib $(OBJDIR)/$(DARWIN_LIB_NAME) make -f common.mk install sudo gcc_select 4.0 clean: "Darwing clean." make -f common.mk clean From fedora-directory-commits at redhat.com Wed Jan 10 02:23:20 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Tue, 9 Jan 2007 21:23:20 -0500 Subject: [Fedora-directory-commits] esc/src/xulrunner Makefile,1.1,1.2 Message-ID: <200701100223.l0A2NKfI004532@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/xulrunner In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4516 Modified Files: Makefile Log Message: Mac univeral binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 13 Sep 2006 17:48:05 -0000 1.1 +++ Makefile 10 Jan 2007 02:23:17 -0000 1.2 @@ -42,7 +42,9 @@ $(MOZ_OBJDIR): $(MOZ_SRCDIR)/.mozconfig $(MOZ_SRCDIR)/client.mk (cd $(MOZ_SRCDIR) ; make -f client.mk build ) +ifneq ($(OS_ARCH),Darwin) (cd $(MOZ_OBJDIR)/xulrunner/installer ; make ) +endif touch $(MOZ_OBJDIR) $(MOZ_SRCDIR)/.mozconfig: $(SOURCE_XP_DIR)/target.$(TYPE) @@ -68,6 +70,11 @@ echo "ac_add_options --with-system-nspr" >> $@.$(TYPE) echo "ac_add_options --with-system-nss" >> $@.$(TYPE) endif +ifeq ($(OS_ARCH),Darwin) + echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE) + echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE) +endif + ifeq ($(OS_ARCH), WINNT) echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE) endif From fedora-directory-commits at redhat.com Wed Jan 10 20:56:02 2007 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Wed, 10 Jan 2007 15:56:02 -0500 Subject: [Fedora-directory-commits] mod_nss nss_engine_pphrase.c, 1.8, 1.9 nss_pcache.c, 1.8, 1.9 Message-ID: <200701102056.l0AKu2jT008492@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8474 Modified Files: nss_engine_pphrase.c nss_pcache.c Log Message: 222173 Stop processing tokens when a login fails so we can correctly report the failure. Fix an off-by-one error in nss_pcache that prevented 1 character passwords (not a huge problem but a bug none-the-less). Index: nss_engine_pphrase.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_pphrase.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nss_engine_pphrase.c 2 Oct 2006 15:57:47 -0000 1.8 +++ nss_engine_pphrase.c 10 Jan 2007 20:56:00 -0000 1.9 @@ -85,8 +85,15 @@ ret = PK11_Authenticate(slot, PR_TRUE, parg); if (SECSuccess != ret) { - status = SECFailure; - break; + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + "Password for slot %s is incorrect.", PK11_GetTokenName(slot)); + PK11_FreeSlot(slot); + /* We return here rather than breaking because: + 1. All tokens must be logged for the server to work. + 2. We'll get a bogus error message from nss_engine_init, -8053, + instead of -8177. + */ + return SECFailure; } parg->retryCount = 0; /* reset counter to 0 for the next token */ PK11_FreeSlot(slot); @@ -153,7 +160,7 @@ if (rv != APR_SUCCESS || (res != PIN_SUCCESS && res != PIN_INCORRECTPW)) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, - "Unable to read from pin store for slot: %s APR err: %d", PK11_GetTokenName(slot), rv); + "Unable to read from pin store for slot: %s APR err: %d pcache: %d", PK11_GetTokenName(slot), rv, res); nss_die(); } } Index: nss_pcache.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_pcache.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nss_pcache.c 18 Nov 2005 16:10:23 -0000 1.8 +++ nss_pcache.c 10 Jan 2007 20:56:00 -0000 1.9 @@ -445,12 +445,13 @@ work = strdup(cmd); s = t = work; + r = NULL; peek = s; if (peek) peek++; while (*s) { - if (*s == '\t' || *peek == '\0') { + if (*s == '\t' || *s == '\0') { if (i == el) { if (*peek != '\0') *s = '\0'; @@ -468,8 +469,9 @@ peek++; } + if (t) r = strdup(t); free(work); - return NULL; + return r; } /* From fedora-directory-commits at redhat.com Fri Jan 12 16:18:22 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 12 Jan 2007 11:18:22 -0500 Subject: [Fedora-directory-commits] ldapserver/m4 db.m4, 1.3, 1.4 mozldap.m4, 1.5, 1.6 svrcore.m4, 1.2, 1.3 Message-ID: <200701121618.l0CGIMIG010956@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10897/ldapserver/m4 Modified Files: db.m4 mozldap.m4 svrcore.m4 Log Message: Resolves: bug 222398 Bug Description: Allow building on Fedora Reviewed by: nhosoi (Thanks!) Fix Description: There are a few issues with building on Fedora (5 or later): 1) Need to be able to build with db4.2, db4.3, db4.4, etc. This version auto-detects the db version from the db.h file it finds. In order to use a different db version, just use configure --with-db=path or --with-db-inc=path that points to a different db.h 2) mozldap and svrcore are now part of Fedora, so we need to look for those components. Look for mozldap6 first to allow building on RHEL-4 as well. mozldap now includes libldif, so add that to the link line. svrcore-devel is now just svrcore - a svrcore runtime package and a svrcore-devel build time package. 3) FHS means FHS - /etc, /var/, prefix=/usr and exec_prefix=/usr. It doesn't make any sense to talk about FHS under a prefix. This means the default build will do /opt/fedora-ds/etc, var, lib, bin, share, and so on instead of /opt/fedora-ds/usr/etc. --with-fhs resets prefix=/usr and exec_prefix=/usr, and overrides the default settings for sysconfdir and localstatedir So, different build types: FHS - use configure --with-fhs - uses /etc, /var, /usr/lib, /usr/share, etc. Nothing - configure - uses /opt/fedora-ds/etc/, var/, bin/, lib/, etc. GNU style - configure --prefix=/usr/local - /usr/local/etc, /usr/local/bin, /usr/local/var, and so on Developers can use configure --prefix=/home/user/fds && make && make install to install local versions Platforms tested: FC-6 Flag Day: no Doc impact: no Index: db.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- db.m4 25 Oct 2006 20:36:45 -0000 1.3 +++ db.m4 12 Jan 2007 16:18:15 -0000 1.4 @@ -65,3 +65,13 @@ AC_MSG_ERROR([db not found, specify with --with-db.]) fi fi +dnl figure out which version of db we're using from the header file +db_ver_maj=`grep DB_VERSION_MAJOR $db_incdir/db.h | awk '{print $3}'` +db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h | awk '{print $3}'` +db_ver_pat=`grep DB_VERSION_PATCH $db_incdir/db.h | awk '{print $3}'` +dnl libname is libdb-maj.min e.g. libdb-4.2 +db_libver=${db_ver_maj}.${db_ver_min} +dnl make sure the lib is available +AC_CHECK_LIB([db-$db_libver], [db_create], [], + [AC_MSG_ERROR([$db_incdir/db.h is version $db_libver but libdb-$db_libver not found])]) + Index: mozldap.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mozldap.m4 22 Nov 2006 03:00:30 -0000 1.5 +++ mozldap.m4 12 Jan 2007 16:18:15 -0000 1.6 @@ -77,14 +77,17 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists mozldap6; then - ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6` - ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6` - ldapsdk_libdir=`$PKG_CONFIG --libs-only-L mozldap6 | sed -e s/-L// | sed -e s/\ *$//` - ldapsdk_bindir=`$PKG_CONFIG --variable=bindir mozldap6` - AC_MSG_RESULT([using system mozldap6]) + mozldappkg=mozldap6 + elif $PKG_CONFIG --exists mozldap; then + mozldappkg=mozldap else AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) fi + ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg` + ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg` + ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\ *$//` + ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg` + AC_MSG_RESULT([using system $mozldappkg]) fi fi if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then @@ -92,7 +95,11 @@ fi dnl default path for the ldap c sdk tools (see [210947] for more details) if test -z "$ldapsdk_bindir" ; then - ldapsdk_bindir=$libdir/mozldap6 + if [ -d $libdir/mozldap6 ] ; then + ldapsdk_bindir=$libdir/mozldap6 + else + ldapsdk_bindir=$libdir/mozldap + fi fi dnl make sure the ldap sdk version is 6 or greater - we do not support Index: svrcore.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/svrcore.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- svrcore.m4 19 Oct 2006 16:53:05 -0000 1.2 +++ svrcore.m4 12 Jan 2007 16:18:15 -0000 1.3 @@ -68,9 +68,9 @@ AC_MSG_CHECKING(for svrcore with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists svrcore-devel; then - svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore-devel` - svrcore_lib=`$PKG_CONFIG --libs-only-L svrcore-devel` + if $PKG_CONFIG --exists svrcore; then + svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore` + svrcore_lib=`$PKG_CONFIG --libs-only-L svrcore` AC_MSG_RESULT([using system svrcore]) fi fi From fedora-directory-commits at redhat.com Fri Jan 12 16:18:17 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 12 Jan 2007 11:18:17 -0500 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.14, 1.15 Makefile.in, 1.15, 1.16 aclocal.m4, 1.6, 1.7 configure, 1.15, 1.16 configure.ac, 1.11, 1.12 ltmain.sh, 1.2, 1.3 Message-ID: <200701121618.l0CGIlce010967@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10897/ldapserver Modified Files: Makefile.am Makefile.in aclocal.m4 configure configure.ac ltmain.sh Log Message: Resolves: bug 222398 Bug Description: Allow building on Fedora Reviewed by: nhosoi (Thanks!) Fix Description: There are a few issues with building on Fedora (5 or later): 1) Need to be able to build with db4.2, db4.3, db4.4, etc. This version auto-detects the db version from the db.h file it finds. In order to use a different db version, just use configure --with-db=path or --with-db-inc=path that points to a different db.h 2) mozldap and svrcore are now part of Fedora, so we need to look for those components. Look for mozldap6 first to allow building on RHEL-4 as well. mozldap now includes libldif, so add that to the link line. svrcore-devel is now just svrcore - a svrcore runtime package and a svrcore-devel build time package. 3) FHS means FHS - /etc, /var/, prefix=/usr and exec_prefix=/usr. It doesn't make any sense to talk about FHS under a prefix. This means the default build will do /opt/fedora-ds/etc, var, lib, bin, share, and so on instead of /opt/fedora-ds/usr/etc. --with-fhs resets prefix=/usr and exec_prefix=/usr, and overrides the default settings for sysconfdir and localstatedir So, different build types: FHS - use configure --with-fhs - uses /etc, /var, /usr/lib, /usr/share, etc. Nothing - configure - uses /opt/fedora-ds/etc/, var/, bin/, lib/, etc. GNU style - configure --prefix=/usr/local - /usr/local/etc, /usr/local/bin, /usr/local/var, and so on Developers can use configure --prefix=/home/user/fds && make && make install to install local versions Platforms tested: FC-6 Flag Day: no Doc impact: no Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.am 16 Nov 2006 18:56:03 -0000 1.14 +++ Makefile.am 12 Jan 2007 16:18:14 -0000 1.15 @@ -30,8 +30,8 @@ #------------------------ NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4 NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3 -LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60 -DB_LINK = @db_lib@ -ldb-4.2 +LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 +DB_LINK = @db_lib@ -ldb- at db_libver@ SASL_LINK = @sasl_lib@ -lsasl2 SVRCORE_LINK = @svrcore_lib@ -lsvrcore ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.in 16 Nov 2006 18:56:03 -0000 1.15 +++ Makefile.in 12 Jan 2007 16:18:14 -0000 1.16 @@ -811,6 +811,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_FALSE = @SOLARIS_FALSE@ @@ -851,6 +852,7 @@ db_incdir = @db_incdir@ db_lib = @db_lib@ db_libdir = @db_libdir@ +db_libver = @db_libver@ debug_defs = @debug_defs@ exec_prefix = @exec_prefix@ host = @host@ @@ -936,8 +938,8 @@ #------------------------ NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4 NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3 -LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60 -DB_LINK = @db_lib@ -ldb-4.2 +LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 +DB_LINK = @db_lib@ -ldb- at db_libver@ SASL_LINK = @sasl_lib@ -lsasl2 SVRCORE_LINK = @svrcore_lib@ -lsvrcore ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aclocal.m4 16 Nov 2006 18:56:03 -0000 1.6 +++ aclocal.m4 12 Jan 2007 16:18:14 -0000 1.7 @@ -1597,7 +1597,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -4305,6 +4305,9 @@ # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -4438,11 +4441,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -4454,7 +4457,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4534,7 +4537,7 @@ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6370,6 +6373,7 @@ done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6402,6 +6406,7 @@ done ]) SED=$lt_cv_path_SED +AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- configure 22 Nov 2006 03:00:30 -0000 1.15 +++ configure 12 Jan 2007 16:18:15 -0000 1.16 @@ -465,7 +465,7 @@ #endif" ac_default_prefix=/opt/fedora-ds -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3819,6 +3819,7 @@ done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3853,6 +3854,7 @@ fi SED=$lt_cv_path_SED + echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -4293,7 +4295,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4296 "configure"' > conftest.$ac_ext + echo '#line 4298 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5428,7 +5430,7 @@ # Provide some information about the compiler. -echo "$as_me:5431:" \ +echo "$as_me:5433:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6491,11 +6493,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6494: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6496: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6498: \$? = $ac_status" >&5 + echo "$as_me:6500: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6759,11 +6761,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6762: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6764: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6766: \$? = $ac_status" >&5 + echo "$as_me:6768: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6863,11 +6865,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6866: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6868: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6870: \$? = $ac_status" >&5 + echo "$as_me:6872: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8332,7 +8334,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8335 "configure"' > conftest.$ac_ext + echo '#line 8337 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8351,7 +8353,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -9229,7 +9231,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11677: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11676: \$? = $ac_status" >&5 + echo "$as_me:11681: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11773,11 +11778,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11776: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11781: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11780: \$? = $ac_status" >&5 + echo "$as_me:11785: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12309,7 +12314,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12312 "configure"' > conftest.$ac_ext + echo '#line 12317 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12328,7 +12333,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -12713,6 +12718,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -12846,11 +12854,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_CXX +predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_CXX +postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -12862,7 +12870,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -12942,7 +12950,7 @@ link_all_deplibs=$link_all_deplibs_CXX # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -13364,11 +13372,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13367: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13375: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13371: \$? = $ac_status" >&5 + echo "$as_me:13379: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13468,11 +13476,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13471: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13479: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13475: \$? = $ac_status" >&5 + echo "$as_me:13483: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14917,7 +14925,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14920 "configure"' > conftest.$ac_ext + echo '#line 14928 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -14936,7 +14944,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -15321,6 +15329,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_F77 +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -15454,11 +15465,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_F77 +predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_F77 +postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -15470,7 +15481,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -15550,7 +15561,7 @@ link_all_deplibs=$link_all_deplibs_F77 # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -15692,11 +15703,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15695: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15706: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15699: \$? = $ac_status" >&5 + echo "$as_me:15710: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15960,11 +15971,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15963: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15974: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15967: \$? = $ac_status" >&5 + echo "$as_me:15978: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16064,11 +16075,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16067: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16078: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16071: \$? = $ac_status" >&5 + echo "$as_me:16082: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17533,7 +17544,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17536 "configure"' > conftest.$ac_ext + echo '#line 17547 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17552,7 +17563,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -17937,6 +17948,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -18070,11 +18084,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_GCJ +predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_GCJ +postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -18086,7 +18100,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18166,7 +18180,7 @@ link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -18418,6 +18432,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_RC +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -18551,11 +18568,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_RC +predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_RC +postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -18567,7 +18584,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18647,7 +18664,7 @@ link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -23356,17 +23373,20 @@ if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists mozldap6; then - ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6` - ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6` - ldapsdk_libdir=`$PKG_CONFIG --libs-only-L mozldap6 | sed -e s/-L// | sed -e s/\ *$//` - ldapsdk_bindir=`$PKG_CONFIG --variable=bindir mozldap6` - echo "$as_me:$LINENO: result: using system mozldap6" >&5 -echo "${ECHO_T}using system mozldap6" >&6 + mozldappkg=mozldap6 + elif $PKG_CONFIG --exists mozldap; then + mozldappkg=mozldap else { { echo "$as_me:$LINENO: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&5 echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&2;} { (exit 1); exit 1; }; } fi + ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg` + ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg` + ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\ *$//` + ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg` + echo "$as_me:$LINENO: result: using system $mozldappkg" >&5 +echo "${ECHO_T}using system $mozldappkg" >&6 fi fi if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then @@ -23375,7 +23395,11 @@ { (exit 1); exit 1; }; } fi if test -z "$ldapsdk_bindir" ; then - ldapsdk_bindir=$libdir/mozldap6 + if -d $libdir/mozldap6 ; then + ldapsdk_bindir=$libdir/mozldap6 + else + ldapsdk_bindir=$libdir/mozldap + fi fi save_cppflags="$CPPFLAGS" @@ -23530,6 +23554,90 @@ { (exit 1); exit 1; }; } fi fi +db_ver_maj=`grep DB_VERSION_MAJOR $db_incdir/db.h | awk '{print $3}'` +db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h | awk '{print $3}'` +db_ver_pat=`grep DB_VERSION_PATCH $db_incdir/db.h | awk '{print $3}'` +db_libver=${db_ver_maj}.${db_ver_min} + +as_ac_Lib=`echo "ac_cv_lib_db-$db_libver''_db_create" | $as_tr_sh` +echo "$as_me:$LINENO: checking for db_create in -ldb-$db_libver" >&5 +echo $ECHO_N "checking for db_create in -ldb-$db_libver... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldb-$db_libver $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char db_create (); +int +main () +{ +db_create (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Lib=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_LIBdb-$db_libver" | $as_tr_cpp` 1 +_ACEOF + + LIBS="-ldb-$db_libver $LIBS" + +else + { { echo "$as_me:$LINENO: error: $db_incdir/db.h is version $db_libver but libdb-$db_libver not found" >&5 +echo "$as_me: error: $db_incdir/db.h is version $db_libver but libdb-$db_libver not found" >&2;} + { (exit 1); exit 1; }; } +fi + + # -*- tab-width: 4; -*- # Configure paths for SASL @@ -23794,9 +23902,9 @@ fi if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists svrcore-devel; then - svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore-devel` - svrcore_lib=`$PKG_CONFIG --libs-only-L svrcore-devel` + if $PKG_CONFIG --exists svrcore; then + svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore` + svrcore_lib=`$PKG_CONFIG --libs-only-L svrcore` echo "$as_me:$LINENO: result: using system svrcore" >&5 echo "${ECHO_T}using system svrcore" >&6 fi @@ -24470,12 +24578,18 @@ -# installation paths + +# installation paths - by default, configure will just +# use /usr as the prefix for everything, which means +# /usr/etc and /usr/var. FHS sez to use /etc and /var. if test "$with_fhs" = "yes"; then - bindir=@prefix@/usr/bin - libdir=@prefix@/usr/lib - datadir=@prefix@/usr/share + ac_default_prefix=/usr + prefix=$ac_default_prefix + exec_prefix=$prefix + sysconfdir='/etc' + localstatedir='/var' fi + # relative to sysconfdir configdir=/fedora-ds/config # relative to datadir @@ -25419,6 +25533,7 @@ s, at CCDEPMODE@,$CCDEPMODE,;t t s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +s, at SED@,$SED,;t t s, at EGREP@,$EGREP,;t t s, at LN_S@,$LN_S,;t t s, at ECHO@,$ECHO,;t t @@ -25455,6 +25570,7 @@ s, at db_lib@,$db_lib,;t t s, at db_libdir@,$db_libdir,;t t s, at db_bindir@,$db_bindir,;t t +s, at db_libver@,$db_libver,;t t s, at sasl_inc@,$sasl_inc,;t t s, at sasl_lib@,$sasl_lib,;t t s, at sasl_libdir@,$sasl_libdir,;t t Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configure.ac 15 Nov 2006 02:07:27 -0000 1.11 +++ configure.ac 12 Jan 2007 16:18:15 -0000 1.12 @@ -91,6 +91,7 @@ AC_SUBST(db_lib) AC_SUBST(db_libdir) AC_SUBST(db_bindir) +AC_SUBST(db_libver) AC_SUBST(sasl_inc) AC_SUBST(sasl_lib) AC_SUBST(sasl_libdir) @@ -104,12 +105,19 @@ AC_SUBST(netsnmp_libdir) AC_SUBST(netsnmp_link) -# installation paths +# installation paths - by default, configure will just +# use /usr as the prefix for everything, which means +# /usr/etc and /usr/var. FHS sez to use /etc and /var. if test "$with_fhs" = "yes"; then - bindir=@prefix@/usr/bin - libdir=@prefix@/usr/lib - datadir=@prefix@/usr/share + ac_default_prefix=/usr + prefix=$ac_default_prefix + exec_prefix=$prefix +dnl as opposed to the default /usr/etc + sysconfdir='/etc' +dnl as opposed to the default /usr/var + localstatedir='/var' fi + # relative to sysconfdir configdir=/fedora-ds/config # relative to datadir Index: ltmain.sh =================================================================== RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ltmain.sh 26 Oct 2006 22:23:03 -0000 1.2 +++ ltmain.sh 12 Jan 2007 16:18:15 -0000 1.3 @@ -46,10 +46,16 @@ VERSION=1.5.22 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi # Check that we have a working $echo. @@ -105,12 +111,14 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -if test "${LC_ALL+set}" = set; then - save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL -fi -if test "${LANG+set}" = set; then - save_LANG="$LANG"; LANG=C; export LANG -fi +for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + fi" +done # Make sure IFS has a sensible default lt_nl=' @@ -136,6 +144,8 @@ preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 ##################################### # Shell function definitions: @@ -327,7 +337,17 @@ *) my_xabs=`pwd`"/$my_xlib" ;; esac my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + extracted_serial=`expr $extracted_serial + 1` + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" $show "${rm}r $my_xdir" $run ${rm}r "$my_xdir" @@ -758,6 +778,7 @@ *.f90) xform=f90 ;; *.for) xform=for ;; *.java) xform=java ;; + *.obj) xform=obj ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -1138,8 +1159,9 @@ for arg do case $arg in - -all-static | -static) - if test "X$arg" = "X-all-static"; then + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1147,12 +1169,20 @@ dlopen_self=$dlopen_self_static fi prefer_static_libs=yes - else + ;; + -static) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built - fi + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac build_libtool_libs=no build_old_libs=yes break @@ -1712,7 +1742,7 @@ continue ;; - -static) + -static | -static-libtool-libs) # The effects of -static are defined in a previous loop. # We used to do the same as -all-static on platforms that # didn't have a PIC flag, but the assumption that the effects @@ -2490,7 +2520,9 @@ if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -3186,7 +3218,7 @@ # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows) + darwin|linux|osf|windows|none) current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_revision" @@ -3410,11 +3442,11 @@ fi # Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - done +# for path in $notinst_path; do +# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` +# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` +# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` +# done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3515,13 +3547,12 @@ int main() { return 0; } EOF $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $deplibs - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" -ne "0"; then + if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) @@ -3560,9 +3591,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $i - # Did it work? - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in @@ -3594,7 +3623,7 @@ droppeddeps=yes $echo $echo "*** Warning! Library $i is needed by this library but I was not able to" - $echo "*** make it link in! You will probably need to install it or some" + $echo "*** make it link in! You will probably need to install it or some" $echo "*** library that it depends on before this library will be fully" $echo "*** functional. Installing it before continuing would be even better." fi @@ -4239,12 +4268,14 @@ reload_conv_objs= gentop= # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. wl= if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -4692,16 +4723,16 @@ case $host in *cygwin* | *mingw* ) if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` fi ;; * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ;; esac ;; @@ -4716,13 +4747,13 @@ # really was required. # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` fi if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. @@ -4809,7 +4840,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` else # fast_install is set to needless relink_command= @@ -4846,7 +4877,7 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` fi # Quote $echo for shipping. @@ -5253,6 +5284,18 @@ Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi + # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH @@ -5395,7 +5438,7 @@ ;; esac $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" + \$echo \"\$0: cannot exec \$program \$*\" exit $EXIT_FAILURE fi else @@ -5581,7 +5624,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -5926,9 +5969,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` fi $echo "$modename: warning: relinking \`$file'" 1>&2 @@ -6137,7 +6180,7 @@ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` $show "$relink_command" if $run eval "$relink_command"; then : @@ -6413,12 +6456,15 @@ fi # Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi + for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + done + # Now prepare to actually exec the command. exec_cmd="\$cmd$args" @@ -6775,9 +6821,9 @@ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE + try to export only the symbols listed in SYMFILE -export-symbols-regex REGEX - try to export only the symbols matching REGEX + try to export only the symbols matching REGEX -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened @@ -6791,9 +6837,11 @@ -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] + specify library version info [each variable defaults to 0] All other options (arguments beginning with \`-') are ignored. From fedora-directory-commits at redhat.com Wed Jan 17 19:12:01 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Wed, 17 Jan 2007 14:12:01 -0500 Subject: [Fedora-directory-commits] esc/src/lib/coolkey CoolKey.cpp,1.2,1.3 Message-ID: <200701171912.l0HJC1Rp031154@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31138 Modified Files: CoolKey.cpp Log Message: Mac only fix for function GetIssuerInfo. Index: CoolKey.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CoolKey.cpp 27 Sep 2006 17:47:46 -0000 1.2 +++ CoolKey.cpp 17 Jan 2007 19:11:59 -0000 1.3 @@ -860,9 +860,11 @@ HRESULT result = S_OK; + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardCreate_Context.\n")); CKYCardContext *cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardCreate_Context. \n")); assert(cardCtxt); if (!cardCtxt) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Context !.\n")); @@ -870,7 +872,9 @@ goto done; } + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardConnection_Create.\n")); conn = CKYCardConnection_Create(cardCtxt); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardConnection_Create.\n")); assert(conn); if (!conn) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Connection!\n")); @@ -878,7 +882,9 @@ goto done; } + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before GetReaderNameForKeyID.\n")); readerName = GetReaderNameForKeyID(aKey); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After GetReaderNameForKeyID.\n")); assert(readerName); if (!readerName) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't get reader name!\n")); @@ -886,7 +892,9 @@ goto done; } + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardConnection_Connect.\n")); status = CKYCardConnection_Connect(conn, readerName); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardConnection_Connect.\n")); if (status != CKYSUCCESS) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't connect to Card!\n")); @@ -894,18 +902,25 @@ goto done; } -CKYCardConnection_BeginTransaction(conn); + #ifndef DARWIN + CKYCardConnection_BeginTransaction(conn); + #endif apduRC = 0; + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYApplet_SelectCoolKeyManager.\n")); status = CKYApplet_SelectCoolKeyManager(conn, &apduRC); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYApplet_SelectCoolKeyManager.\n")); if (status != CKYSUCCESS) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't select CoolKey manager!\n")); goto done; } + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYApplet_GetIssuerInfo.\n")); status = CKYApplet_GetIssuerInfo(conn, &ISSUER_INFO, &apduRC); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYApplet_GetIssuerInfo.\n")); + if(status != CKYSUCCESS) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Error actually getting IssuerInfo!\n")); @@ -941,7 +956,9 @@ done: if (conn) { + #ifndef DARWIN CKYCardConnection_EndTransaction(conn); + #endif CKYCardConnection_Disconnect(conn); CKYCardConnection_Destroy(conn); } From fedora-directory-commits at redhat.com Thu Jan 18 00:59:13 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Wed, 17 Jan 2007 19:59:13 -0500 Subject: [Fedora-directory-commits] coolkey configure.in,1.7,1.8 Message-ID: <200701180059.l0I0xDVe031856@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31835 Modified Files: configure.in Log Message: Add compile and link flags to compile on darwin. Index: configure.in =================================================================== RCS file: /cvs/dirsec/coolkey/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure.in 30 Nov 2006 22:35:22 -0000 1.7 +++ configure.in 18 Jan 2007 00:59:11 -0000 1.8 @@ -71,8 +71,11 @@ MAC=1 SCARD_LIB_NAME="PCSC.Framework/PCSC" PCSC_MSG=yes - PCSC_CFLAGS="" + PCSC_CFLAGS="-I/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers" PCSC_LIBS="-Wl,-framework,PCSC" + CFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" + LDFLAGS="-L/System/Library/Frameworks/Security.framework/Versions/Current/Security -arch ppc -arch i386" + CXXFLAGS="-DMAC -I/System/Library/Frameworks/Security.framework/Versions/Current/Headers -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" ;; *) AC_MSG_RESULT([UNIX/LINUX]) From fedora-directory-commits at redhat.com Thu Jan 18 01:00:27 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Wed, 17 Jan 2007 20:00:27 -0500 Subject: [Fedora-directory-commits] coolkey/src/coolkey Makefile.am,1.4,1.5 Message-ID: <200701180100.l0I10RU3031943@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/coolkey/src/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31893 Modified Files: Makefile.am Log Message: Alter LDFLAGS to allow darwin build to produce a dylib. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.am 25 Aug 2006 00:31:40 -0000 1.4 +++ Makefile.am 18 Jan 2007 01:00:25 -0000 1.5 @@ -48,7 +48,7 @@ slot.h \ $(NULL) -libcoolkeypk11_la_LDFLAGS = -module -avoid-version -export-symbols coolkeypk11.sym -no-undefined +libcoolkeypk11_la_LDFLAGS = -avoid-version -export-symbols coolkeypk11.sym -no-undefined libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/src/libckyapplet $(PCSC_CFLAGS) $(ZLIB_CFLAGS) libcoolkeypk11_la_DEPENDENCIES = coolkeypk11.sym libcoolkeypk11_la_LIBADD = @LIBCKYAPPLET@ $(ZLIB_LIBS) From fedora-directory-commits at redhat.com Thu Jan 18 01:00:57 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Wed, 17 Jan 2007 20:00:57 -0500 Subject: [Fedora-directory-commits] coolkey/src/coolkey Makefile.in,1.7,1.8 Message-ID: <200701180100.l0I10v7O032006@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/coolkey/src/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31964 Modified Files: Makefile.in Log Message: Alter LDFLAGS to allow darwin build to produce a dylib. Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.in 30 Nov 2006 22:35:22 -0000 1.7 +++ Makefile.in 18 Jan 2007 01:00:55 -0000 1.8 @@ -260,7 +260,7 @@ slot.h \ $(NULL) -libcoolkeypk11_la_LDFLAGS = -module -avoid-version -export-symbols coolkeypk11.sym -no-undefined +libcoolkeypk11_la_LDFLAGS = -avoid-version -export-symbols coolkeypk11.sym -no-undefined libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/src/libckyapplet $(PCSC_CFLAGS) $(ZLIB_CFLAGS) libcoolkeypk11_la_DEPENDENCIES = coolkeypk11.sym libcoolkeypk11_la_LIBADD = @LIBCKYAPPLET@ $(ZLIB_LIBS) From fedora-directory-commits at redhat.com Thu Jan 18 01:02:38 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Wed, 17 Jan 2007 20:02:38 -0500 Subject: [Fedora-directory-commits] coolkey/src/install Makefile.am,1.1,1.2 Message-ID: <200701180102.l0I12cbH002990@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/coolkey/src/install In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2900 Modified Files: Makefile.am Log Message: Utilize the contents of NSS_LIBS when linking executable, used when building Mac version. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/coolkey/src/install/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 13 Oct 2006 01:16:26 -0000 1.1 +++ Makefile.am 18 Jan 2007 01:02:35 -0000 1.2 @@ -24,4 +24,4 @@ bin_PROGRAMS=pk11install pk11install_SOURCES = pk11install.c -pk11install_LDADD = -lsoftokn3 +pk11install_LDADD = $(NSS_LIBS) -lsoftokn3 From fedora-directory-commits at redhat.com Thu Jan 18 01:03:56 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Wed, 17 Jan 2007 20:03:56 -0500 Subject: [Fedora-directory-commits] coolkey/src/install Makefile.in,1.2,1.3 Message-ID: <200701180103.l0I13u8U003117@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/coolkey/src/install In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3099 Modified Files: Makefile.in Log Message: Utilize the contents of NSS_LIBS when linking executable, used when building Mac version. Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/coolkey/src/install/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 30 Nov 2006 22:35:28 -0000 1.2 +++ Makefile.in 18 Jan 2007 01:03:54 -0000 1.3 @@ -74,7 +74,8 @@ PROGRAMS = $(bin_PROGRAMS) am_pk11install_OBJECTS = pk11install.$(OBJEXT) pk11install_OBJECTS = $(am_pk11install_OBJECTS) -pk11install_DEPENDENCIES = +am__DEPENDENCIES_1 = +pk11install_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -210,7 +211,7 @@ target_vendor = @target_vendor@ INCLUDES = $(NSS_CFLAGS) pk11install_SOURCES = pk11install.c -pk11install_LDADD = -lsoftokn3 +pk11install_LDADD = $(NSS_LIBS) -lsoftokn3 all: all-am .SUFFIXES: From fedora-directory-commits at redhat.com Thu Jan 18 01:05:09 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Wed, 17 Jan 2007 20:05:09 -0500 Subject: [Fedora-directory-commits] coolkey/src/install pk11install.c, 1.1, 1.2 Message-ID: <200701180105.l0I159Wr003281@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/coolkey/src/install In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3194 Modified Files: pk11install.c Log Message: Use define MAC instead of DARWIN for Mac ifdefs. Allows program to compile on the Mac. Index: pk11install.c =================================================================== RCS file: /cvs/dirsec/coolkey/src/install/pk11install.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pk11install.c 13 Oct 2006 01:16:26 -0000 1.1 +++ pk11install.c 18 Jan 2007 01:05:07 -0000 1.2 @@ -144,7 +144,7 @@ { AppDataDir, "Thunderbird\\Profiles\\*", NULL }, { NetscapeInstallDir, "..\\Users\\*", NULL }, #endif -#ifndef DARWIN +#ifndef MAC #ifdef UNIX { HomeDir, ".mozilla/firefox/*", NULL }, { HomeDir, ".mozilla/*", NULL }, @@ -152,7 +152,7 @@ { HomeDir, ".netscape", NULL }, #endif #endif -#ifdef DARWIN +#ifdef MAC { HomeDir, "Library/Mozilla/Profiles/*", "*.slt"}, { HomeDir, "Library/Application Support/Firefox/Profiles/*", NULL }, From fedora-directory-commits at redhat.com Fri Jan 19 22:29:26 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Fri, 19 Jan 2007 17:29:26 -0500 Subject: [Fedora-directory-commits] esc/src/lib/coolkey Mac-universal.mk, 1.1, 1.2 Message-ID: <200701192229.l0JMTQkl021791@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21775 Modified Files: Mac-universal.mk Log Message: Don't hard code path to CoolKey include directory. Index: Mac-universal.mk =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/Mac-universal.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Mac-universal.mk 10 Jan 2007 02:22:26 -0000 1.1 +++ Mac-universal.mk 19 Jan 2007 22:29:24 -0000 1.2 @@ -40,7 +40,7 @@ make -f common.mk clean sudo gcc_select 3.3 echo "Build ppc." - make -f common.mk OSX_ARCH_FLAGS="-arch ppc" CKY_INCLUDE=/usr/local/CoolKey/include + make -f common.mk OSX_ARCH_FLAGS="-arch ppc" cp $(OBJDIR)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC) lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(OBJDIR)/$(DARWIN_LIB_NAME) From fedora-directory-commits at redhat.com Thu Jan 25 16:47:47 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 25 Jan 2007 11:47:47 -0500 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.15, 1.16 Makefile.in, 1.16, 1.17 configure, 1.16, 1.17 configure.ac, 1.12, 1.13 aclocal.m4, 1.7, 1.8 Message-ID: <200701251647.l0PGlmG5030060@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30023/ldapserver Modified Files: Makefile.am Makefile.in configure configure.ac aclocal.m4 Log Message: Resolves: bug 224291 Bug Description: Move script-templates from sysconfdir to datadir Reviewed by: nkinder, dennis (Thanks!) Files: see diff Branch: HEAD Fix Description: Just change sysconfdir to datadir in both the Makefile.am (which controls where the files are put during installation) and in create_instance.c (which controls where instance creation looks for the templates to use them to create the real scripts). Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.am 12 Jan 2007 16:18:14 -0000 1.15 +++ Makefile.am 25 Jan 2007 16:47:45 -0000 1.16 @@ -60,7 +60,7 @@ schemadir = $(sysconfdir)@schemadir@ serverdir = $(libdir)@serverdir@ serverplugindir = $(libdir)@serverplugindir@ -taskdir = $(sysconfdir)@scripttemplatedir@ +taskdir = $(datadir)@scripttemplatedir@ #------------------------ # Build Products Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.in 12 Jan 2007 16:18:14 -0000 1.16 +++ Makefile.in 25 Jan 2007 16:47:45 -0000 1.17 @@ -951,7 +951,7 @@ #------------------------ BUILT_SOURCES = dirver.h dberrstrs.h CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties -taskdir = $(sysconfdir)@scripttemplatedir@ +taskdir = $(datadir)@scripttemplatedir@ server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \ libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \ Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- configure 12 Jan 2007 16:18:15 -0000 1.16 +++ configure 25 Jan 2007 16:47:45 -0000 1.17 @@ -24602,7 +24602,7 @@ serverdir=/fedora-ds # relative to libdir serverplugindir=/fedora-ds/plugins -# relative to sysconfdir +# relative to datadir scripttemplatedir=/fedora-ds/script-templates Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure.ac 12 Jan 2007 16:18:15 -0000 1.12 +++ configure.ac 25 Jan 2007 16:47:45 -0000 1.13 @@ -130,7 +130,7 @@ serverdir=/fedora-ds # relative to libdir serverplugindir=/fedora-ds/plugins -# relative to sysconfdir +# relative to datadir scripttemplatedir=/fedora-ds/script-templates AC_SUBST(configdir) AC_SUBST(sampledatadir) From fedora-directory-commits at redhat.com Thu Jan 25 16:47:48 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 25 Jan 2007 11:47:48 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.39, 1.40 Message-ID: <200701251647.l0PGlm0I030064@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30023/ldapserver/ldap/admin/src Modified Files: create_instance.c Log Message: Resolves: bug 224291 Bug Description: Move script-templates from sysconfdir to datadir Reviewed by: nkinder, dennis (Thanks!) Files: see diff Branch: HEAD Fix Description: Just change sysconfdir to datadir in both the Makefile.am (which controls where the files are put during installation) and in create_instance.c (which controls where instance creation looks for the templates to use them to create the real scripts). Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- create_instance.c 12 Dec 2006 06:39:17 -0000 1.39 +++ create_instance.c 25 Jan 2007 16:47:45 -0000 1.40 @@ -708,7 +708,7 @@ } PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s", - cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, + cf->datadir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP, FILE_PATHSEP, name); PR_snprintf(fn, sizeof(fn), "%s%c%s", cs_path, FILE_PATHSEP, name); create_instance_mkdir(cs_path, NEWDIR_MODE); @@ -774,7 +774,7 @@ int fnlen = 0; PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s", - cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, + cf->datadir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP, FILE_PATHSEP, name); PR_snprintf(fn, sizeof(fn), "%s%c%s%cbin", cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP); From fedora-directory-commits at redhat.com Thu Jan 25 22:08:57 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Thu, 25 Jan 2007 17:08:57 -0500 Subject: [Fedora-directory-commits] esc/src/app/xul/esc application.ini, 1.3, 1.4 Message-ID: <200701252208.l0PM8vpu021053@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xul/esc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21037 Modified Files: application.ini Log Message: Bump build ID. Index: application.ini =================================================================== RCS file: /cvs/dirsec/esc/src/app/xul/esc/application.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- application.ini 25 Oct 2006 04:00:14 -0000 1.3 +++ application.ini 25 Jan 2007 22:08:55 -0000 1.4 @@ -29,7 +29,7 @@ ; ; This field specifies your application's build ID (timestamp). This field is ; required. -BuildID=00000000018 +BuildID=00000000020 ; ; This ID is just an example. Every XUL app ought to have it's own unique ID. ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on From fedora-directory-commits at redhat.com Thu Jan 25 22:36:23 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Thu, 25 Jan 2007 17:36:23 -0500 Subject: [Fedora-directory-commits] esc/src/xulrunner Makefile,1.2,1.3 Message-ID: <200701252236.l0PMaNgR022657@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/xulrunner In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22627 Modified Files: Makefile Log Message: Backout of Mac universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 10 Jan 2007 02:23:17 -0000 1.2 +++ Makefile 25 Jan 2007 22:36:20 -0000 1.3 @@ -70,11 +70,6 @@ echo "ac_add_options --with-system-nspr" >> $@.$(TYPE) echo "ac_add_options --with-system-nss" >> $@.$(TYPE) endif -ifeq ($(OS_ARCH),Darwin) - echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE) - echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE) -endif - ifeq ($(OS_ARCH), WINNT) echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE) endif From fedora-directory-commits at redhat.com Thu Jan 25 22:37:44 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Thu, 25 Jan 2007 17:37:44 -0500 Subject: [Fedora-directory-commits] esc/src/xulrunner Makefile,1.3,1.4 Message-ID: <200701252237.l0PMbiv8028295@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/xulrunner In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25269 Modified Files: Makefile Log Message: Restore Mac Universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 25 Jan 2007 22:36:20 -0000 1.3 +++ Makefile 25 Jan 2007 22:37:42 -0000 1.4 @@ -70,6 +70,11 @@ echo "ac_add_options --with-system-nspr" >> $@.$(TYPE) echo "ac_add_options --with-system-nss" >> $@.$(TYPE) endif +ifeq ($(OS_ARCH),Darwin) + echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE) + echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE) +endif + ifeq ($(OS_ARCH), WINNT) echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE) endif From fedora-directory-commits at redhat.com Fri Jan 26 01:33:55 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Thu, 25 Jan 2007 20:33:55 -0500 Subject: [Fedora-directory-commits] esc/src/app/xpcom Makefile, 1.2, 1.2.2.1 Makefile.moz, 1.4, 1.4.2.1 Message-ID: <200701260133.l0Q1Xt9O007468@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xpcom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7450 Modified Files: Tag: ESC_CS_72_BRANCH Makefile Makefile.moz Log Message: Mac Universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- Makefile 13 Sep 2006 17:50:07 -0000 1.2 +++ Makefile 26 Jan 2007 01:33:53 -0000 1.2.2.1 @@ -26,6 +26,18 @@ MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla MOZ_OBJDIR=$(DIST)/xulrunner_build +DARWIN_LIB_NAME=librhCoolKey.dylib + +UNIVERSAL_OFFSET_PPC=ppc +UNIVERSAL_OFFSET_386=i386 +MOZ_OBJDIR_PPC= +ifeq ($(OS_ARCH),Darwin) +MOZ_OBJDIR=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_386) +MOZ_OBJDIR_PPC=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_PPC) +endif + + + ifeq ($(OS_ARCH),Linux) endif @@ -39,6 +51,16 @@ MOZ_SRCDIR=$(MOZ_SRCDIR) \ MOZ_OBJDIR=$(MOZ_OBJDIR) \ +ifeq ($(OS_ARCH),Darwin) + echo "Darwin all" + $(MAKE) -f Makefile.moz $@ \ + OBJDIR=$(OBJDIR) \ + CORE_DIST=$(DIST) \ + CORE_INC=$(CORE_INC) \ + MOZ_SRCDIR=$(MOZ_SRCDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) +endif + libs:: echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR)" @@ -49,12 +71,30 @@ MOZ_SRCDIR=$(MOZ_SRCDIR) \ MOZ_OBJDIR=$(MOZ_OBJDIR) \ +ifeq ($(OS_ARCH),Darwin) + echo "Darwin libs" + mkdir -p $(UNIVERSAL_OFFSET_386) + mkdir -p $(UNIVERSAL_OFFSET_PPC) + mv -n $(DARWIN_LIB_NAME) i386 + rm Makefile.in + rm *.o + $(MAKE) -f Makefile.moz libs \ + OBJDIR=$(OBJDIR) \ + CORE_DIST=$(DIST) \ + CORE_INC=$(CORE_INC) \ + MOZ_SRCDIR=$(MOZ_SRCDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) + mv $(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC) +endif + +ifeq ($(OS_ARCH),Darwin) + echo "Darwin Creating UNI binary." + lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(DARWIN_LIB_NAME) +endif $(MAKE) -f Makefile.moz deploy \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ MOZ_SRCDIR=$(MOZ_SRCDIR) \ - MOZ_OBJDIR=$(MOZ_OBJDIR) \ - - + MOZ_OBJDIR=$(MOZ_OBJDIR) Index: Makefile.moz =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.moz,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- Makefile.moz 25 Oct 2006 03:58:16 -0000 1.4 +++ Makefile.moz 26 Jan 2007 01:33:53 -0000 1.4.2.1 @@ -1,4 +1,4 @@ - +# # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. @@ -16,7 +16,7 @@ # ***** END COPYRIGHT BLOCK ***** CORE_DEPTH = ../../.. -MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build +#MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build MOZ_SRCDIR = $(CORE_DEPTH)/dist/src/mozilla DEPTH = $(MOZ_OBJDIR) topsrcdir = $(MOZ_SRCDIR) @@ -42,13 +42,14 @@ XULRUNNER_BIN_PATH = $(MOZ_OBJDIR)/dist/xulrunner XULRUNNER_EXEC = xulrunner ifeq ($(OS_ARCH), Darwin) -XULRUNNER_BIN_PATH = /Library/Frameworks/XUL.framework +XULRUNNER_BIN_PATH = $(MOZ_OBJDIR)/dist/universal/xulrunner/XUL.framework XULRUNNER_EXEC = xulrunner-bin XULRUNNER_FRAME_DEST = ESC.app/Contents/Frameworks/XUL.framework XULRUNNER_FRAME_BASE = ESC.app/Contents/Frameworks endif -DEPLOY_OFFSET=/esc +#DEPLOY_OFFSET=/esc +DEPLOY_OFFSET=/src ifeq ($(OS_ARCH),Linux) DEPLOY_OFFSET=/src @@ -66,12 +67,23 @@ XPIDL_MODULE = rhCoolKey LIBRARY_NAME = rhCoolKey + +CKY_LIB_LDD= +ifdef CKY_LIB +CKY_LIB_LDD = -L$(CKY_LIB) +endif + + ifeq ($(OS_ARCH),WINNT) -COOLKEY_LIBS = $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib $(CORE_DIST)/lib/ckyapplet.lib +COOLKEY_LIBS = $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib $(CKY_LIB_LDD) $(CORE_DIST)/lib/ckyapplet.lib TESTCPPSRCS = CoolKeyCSP.cpp MOZ_NO_DEBUG_RTL=1 else -COOLKEY_LIBS = -L$(CORE_DIST)/lib -lckymanager -lhttpchunked -lckyapplet +COOLKEY_LIBS = -L$(CORE_DIST)/lib -lhttpchunked -lckymanager $(CKY_LIB_LDD) -lckyapplet +endif + +ifeq ($(OS_ARCH),Darwin) +COOLKEY_LIBS += -lsystemStubs endif IS_COMPONENT = 1 @@ -129,6 +141,10 @@ rm -f Makefile.in rm -rf $(DEPLOY_OBJDIR) rm -rf $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/esc +ifeq ($(OS_ARCH),Darwin) + rm -rf ppc + rm -rf i386 +endif deploy: $(DEPLOY_OBJDIR) echo "deploy! on $(OS_ARCH)" From fedora-directory-commits at redhat.com Fri Jan 26 01:34:46 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Thu, 25 Jan 2007 20:34:46 -0500 Subject: [Fedora-directory-commits] esc/src/app/xpcom/tray Makefile, 1.2, 1.2.2.1 Makefile.moz, 1.3, 1.3.2.1 Message-ID: <200701260134.l0Q1YkV9007497@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/app/xpcom/tray In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7479 Modified Files: Tag: ESC_CS_72_BRANCH Makefile Makefile.moz Log Message: Mac Universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- Makefile 13 Sep 2006 17:50:07 -0000 1.2 +++ Makefile 26 Jan 2007 01:34:44 -0000 1.2.2.1 @@ -21,17 +21,23 @@ include $(CORE_DEPTH)/coreconf/config.mk include $(CORE_DEPTH)/coreconf/rules.mk +DARWIN_LIB_NAME=librhTray.dylib + + CORE_INC=$(SOURCE_XP_DIR)/public MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla MOZ_OBJDIR=$(DIST)/xulrunner_build -ifeq ($(OS_ARCH), Darwin) -#MOZ_OBJDIR=$(MOZ_SRCDIR) -endif -ifeq ($(OS_ARCH),Linux) +UNIVERSAL_OFFSET_PPC=ppc +UNIVERSAL_OFFSET_386=i386 +MOZ_OBJDIR_PPC= +ifeq ($(OS_ARCH),Darwin) +MOZ_OBJDIR=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_386) +MOZ_OBJDIR_PPC=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_PPC) endif + all export install clean deploy args:: echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR) $@" echo $(DIST) @@ -42,6 +48,16 @@ MOZ_SRCDIR=$(MOZ_SRCDIR) \ MOZ_OBJDIR=$(MOZ_OBJDIR) \ +ifeq ($(OS_ARCH),Darwin) + echo "Darwin all" + $(MAKE) -f Makefile.moz $@ \ + OBJDIR=$(OBJDIR) \ + CORE_DIST=$(DIST) \ + CORE_INC=$(CORE_INC) \ + MOZ_SRCDIR=$(MOZ_SRCDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) +endif + libs:: $(MAKE) -f Makefile.moz libs \ @@ -49,13 +65,31 @@ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ MOZ_SRCDIR=$(MOZ_SRCDIR) \ - MOZ_OBJ_DIR=$(MOZ_OBJDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR) \ + +ifeq ($(OS_ARCH),Darwin) + echo "Darwin libs" + mkdir -p $(UNIVERSAL_OFFSET_386) + mkdir -p $(UNIVERSAL_OFFSET_PPC) + mv -n $(DARWIN_LIB_NAME) i386 + rm Makefile.in + rm *.o + $(MAKE) -f Makefile.moz libs \ + OBJDIR=$(OBJDIR) \ + CORE_DIST=$(DIST) \ + CORE_INC=$(CORE_INC) \ + MOZ_SRCDIR=$(MOZ_SRCDIR) \ + MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) + mv $(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC) +endif +ifeq ($(OS_ARCH),Darwin) + echo "Darwin Creating UNI binary." + lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(DARWIN_LIB_NAME) +endif $(MAKE) -f Makefile.moz deploy \ OBJDIR=$(OBJDIR) \ CORE_DIST=$(DIST) \ CORE_INC=$(CORE_INC) \ MOZ_SRCDIR=$(MOZ_SRCDIR) \ - MOZ_OBJ_DIR=$(MOZ_OBJDIR) - - + MOZ_OBJDIR=$(MOZ_OBJDIR) Index: Makefile.moz =================================================================== RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.moz,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- Makefile.moz 25 Oct 2006 03:59:03 -0000 1.3 +++ Makefile.moz 26 Jan 2007 01:34:44 -0000 1.3.2.1 @@ -16,7 +16,9 @@ # ***** END COPYRIGHT BLOCK ***** CORE_DEPTH = ../../../.. -MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build +#MOZ_OBJDIR = $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build +#MOZ_OBJDIR=$(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build/i386 + MOZ_SRCDIR = $(CORE_DEPTH)/dist/src/mozilla DEPTH = $(MOZ_OBJDIR) topsrcdir = $(MOZ_SRCDIR) @@ -32,14 +34,17 @@ NOTIFY_CXX_FLAGS = -I$(NOTIFY_DEPTH) $(shell pkg-config --cflags glib-2.0) NOTIFY_LDFLAGS = $(shell pkg-config --libs libnotify) + NO_DIST_INSTALL = 1 ifeq ($(OS_ARCH),Linux) endif + -include $(MOZ_OBJDIR)/config/autoconf.mk -DEPLOY_OFFSET=/esc +#DEPLOY_OFFSET=/esc +DEPLOY_OFFSET=/src ifeq ($(OS_ARCH),Linux) DEPLOY_OFFSET=/src endif @@ -96,7 +101,7 @@ endif ifeq ($(OS_ARCH),Darwin) - +#OS_CXXFLAGS += -arch i386 -arch ppc CPPSRCS = \ rhMacTray.cpp \ $(NULL) @@ -135,6 +140,10 @@ clean:: rm -f Makefile.in +ifeq ($(OS_ARCH),Darwin) + rm -rf i386 + rm -rf ppc +endif deploy:: echo "Deploying" From fedora-directory-commits at redhat.com Fri Jan 26 01:36:14 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Thu, 25 Jan 2007 20:36:14 -0500 Subject: [Fedora-directory-commits] esc/src/lib/coolkey Makefile, 1.1, 1.1.2.1 manifest.mn, 1.2, 1.2.2.1 CoolKey.cpp, 1.2, 1.2.2.1 Message-ID: <200701260136.l0Q1aEoo007540@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7520 Modified Files: Tag: ESC_CS_72_BRANCH Makefile manifest.mn CoolKey.cpp Log Message: Mac Universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/Makefile,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- Makefile 12 Jun 2006 23:39:52 -0000 1.1 +++ Makefile 26 Jan 2007 01:36:12 -0000 1.1.2.1 @@ -8,7 +8,7 @@ # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. @@ -17,57 +17,30 @@ # All rights reserved. # END COPYRIGHT BLOCK +UNIVERSAL_OFFSET_PPC=ppc +UNIVERSAL_OFFSET_386=i386 -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -include config.mk - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - +CORE_DEPTH=../../.. include $(CORE_DEPTH)/coreconf/config.mk -#only want the library -SHARED_LIBRARY= -IMPORT_LIBRARY= - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DEFINES += -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -#include config.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - include $(CORE_DEPTH)/coreconf/rules.mk -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### +libs:: +ifeq ($(OS_ARCH),Darwin) + echo "Build Darwin." + make -f Mac-universal.mk +else + echo "Build Linux or Windows." + make -f common.mk -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -ifeq ($(OS_ARCH), WINNT) -#CPPSRCS += CoolKeyCSP.cpp endif +ifeq ($(OS_ARCH),Darwin) +clean:: + echo "Cleaning." + rm -rf $(UNIVERSAL_OFFSET_PPC) + rm -rf $(UNIVERSAL_OFFSET_386) + make -f common.mk clean +endif Index: manifest.mn =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/manifest.mn,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- manifest.mn 27 Sep 2006 17:47:46 -0000 1.2 +++ manifest.mn 26 Jan 2007 01:36:12 -0000 1.2.2.1 @@ -17,6 +17,9 @@ CORE_DEPTH = ../../.. +XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build + + SYS_INC = /usr/include MODULE = ckymanager LIBRARY_NAME = $(MODULE) @@ -24,7 +27,7 @@ ifndef MOZ_OFFSET MOZ_OFFSET = mozilla-1.7.13 endif -DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss +DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr MAPFILE = $(OBJDIR)/ckymanager.def #EXTRA_LIBS += -L$(DIST)/lib -lckyapplet Index: CoolKey.cpp =================================================================== RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- CoolKey.cpp 27 Sep 2006 17:47:46 -0000 1.2 +++ CoolKey.cpp 26 Jan 2007 01:36:12 -0000 1.2.2.1 @@ -860,9 +860,11 @@ HRESULT result = S_OK; + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardCreate_Context.\n")); CKYCardContext *cardCtxt = CKYCardContext_Create(SCARD_SCOPE_USER); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardCreate_Context. \n")); assert(cardCtxt); if (!cardCtxt) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Context !.\n")); @@ -870,7 +872,9 @@ goto done; } + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardConnection_Create.\n")); conn = CKYCardConnection_Create(cardCtxt); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardConnection_Create.\n")); assert(conn); if (!conn) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't create Card Connection!\n")); @@ -878,7 +882,9 @@ goto done; } + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before GetReaderNameForKeyID.\n")); readerName = GetReaderNameForKeyID(aKey); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After GetReaderNameForKeyID.\n")); assert(readerName); if (!readerName) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't get reader name!\n")); @@ -886,7 +892,9 @@ goto done; } + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYCardConnection_Connect.\n")); status = CKYCardConnection_Connect(conn, readerName); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYCardConnection_Connect.\n")); if (status != CKYSUCCESS) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't connect to Card!\n")); @@ -894,18 +902,25 @@ goto done; } -CKYCardConnection_BeginTransaction(conn); + #ifndef DARWIN + CKYCardConnection_BeginTransaction(conn); + #endif apduRC = 0; + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYApplet_SelectCoolKeyManager.\n")); status = CKYApplet_SelectCoolKeyManager(conn, &apduRC); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYApplet_SelectCoolKeyManager.\n")); if (status != CKYSUCCESS) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Can't select CoolKey manager!\n")); goto done; } + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: Before CKYApplet_GetIssuerInfo.\n")); status = CKYApplet_GetIssuerInfo(conn, &ISSUER_INFO, &apduRC); + PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("CoolKeyGetIssuerInfo:: After CKYApplet_GetIssuerInfo.\n")); + if(status != CKYSUCCESS) { PR_LOG( coolKeyLog, PR_LOG_ERROR, ("Attempting to get key issuer info. Error actually getting IssuerInfo!\n")); @@ -941,7 +956,9 @@ done: if (conn) { + #ifndef DARWIN CKYCardConnection_EndTransaction(conn); + #endif CKYCardConnection_Disconnect(conn); CKYCardConnection_Destroy(conn); } From fedora-directory-commits at redhat.com Fri Jan 26 01:37:16 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Thu, 25 Jan 2007 20:37:16 -0500 Subject: [Fedora-directory-commits] esc/src/lib/NssHttpClient Makefile, 1.1, 1.1.2.1 manifest.mn, 1.2, 1.2.2.1 Message-ID: <200701260137.l0Q1bGqt007572@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/lib/NssHttpClient In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7554 Modified Files: Tag: ESC_CS_72_BRANCH Makefile manifest.mn Log Message: Mac Universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/Makefile,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- Makefile 12 Jun 2006 23:39:53 -0000 1.1 +++ Makefile 26 Jan 2007 01:37:14 -0000 1.1.2.1 @@ -21,11 +21,13 @@ # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn + +#include manifest.mn include config.mk +include manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # @@ -68,3 +70,11 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### + +UNIVERSAL_OFFSET= +ifeq ($(OS_ARCH), Darwin) +UNIVERSAL_OFFSET=i386 +XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build/$(UNIVERSAL_OFFSET) + +DEFINES += -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk +endif Index: manifest.mn =================================================================== RCS file: /cvs/dirsec/esc/src/lib/NssHttpClient/manifest.mn,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- manifest.mn 27 Sep 2006 17:49:21 -0000 1.2 +++ manifest.mn 26 Jan 2007 01:37:14 -0000 1.2.2.1 @@ -17,6 +17,9 @@ CORE_DEPTH = ../../.. +XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build + + SYS_INC = /usr/include MODULE = httpchunked LIBRARY_NAME = $(MODULE) @@ -25,8 +28,10 @@ ifndef MOZ_OFFSET MOZ_OFFSET = mozilla-1.7.13 endif + + MAPFILE = $(OBJDIR)/httpchunked.def -DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss +DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr CPPSRCS = \ Cache.cpp \ From fedora-directory-commits at redhat.com Fri Jan 26 01:38:14 2007 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Thu, 25 Jan 2007 20:38:14 -0500 Subject: [Fedora-directory-commits] esc/src/xulrunner Makefile,1.3,1.3.2.1 Message-ID: <200701260138.l0Q1cESU007603@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/esc/src/xulrunner In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587 Modified Files: Tag: ESC_CS_72_BRANCH Makefile Log Message: Mac Universal binary. Index: Makefile =================================================================== RCS file: /cvs/dirsec/esc/src/xulrunner/Makefile,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- Makefile 25 Jan 2007 22:36:20 -0000 1.3 +++ Makefile 26 Jan 2007 01:38:12 -0000 1.3.2.1 @@ -70,6 +70,11 @@ echo "ac_add_options --with-system-nspr" >> $@.$(TYPE) echo "ac_add_options --with-system-nss" >> $@.$(TYPE) endif +ifeq ($(OS_ARCH),Darwin) + echo ". \$$topsrcdir/build/macosx/universal/mozconfig" >> $@.$(TYPE) + echo "ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk" >> $@.$(TYPE) +endif + ifeq ($(OS_ARCH), WINNT) echo "ac_add_options --disable-javaxpcom" >> $@.$(TYPE) endif From fedora-directory-commits at redhat.com Fri Jan 26 20:00:47 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 26 Jan 2007 15:00:47 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts template-start-slapd.in, 1.3, 1.4 template-stop-slapd.in, 1.3, 1.4 Message-ID: <200701262000.l0QK0lF5016750@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16696/ldapserver/ldap/admin/src/scripts Modified Files: template-start-slapd.in template-stop-slapd.in Log Message: Resolves: bug 224606 Bug Description: Instance specific dirs should be in instance directory Reviewed by: nhosoi (Thanks!) Fix Description: Fixed create instance to create these instance specific directories: /var/lock/slapd-instance -> /var/lock/fedora-ds/slapd-instance /var/lib/slapd-instance -> /var/lib/fedora-ds/slapd-instance /var/log/slapd-instance -> /var/log/fedora-ds/slapd-instance /var/run/slapd-instance -> /var/run/fedora-ds For now, I'm side-stepping the question of what to do about permissions on /var/run/fedora-ds/slapd-instance.pid - we'll address this in the RPM creation. I've also moved the migration scripts to the %{_libdir}/fedora-ds/slapd-instance directory, and I've made the default directory for the key/cert db the same as the config directory. I think the dynamic nature of their configuration warrants the move. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: template-start-slapd.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- template-start-slapd.in 28 Nov 2006 17:13:48 -0000 1.3 +++ template-start-slapd.in 26 Jan 2007 20:00:45 -0000 1.4 @@ -16,8 +16,8 @@ export NETSITE_ROOT DS_CONFIG_DIR={{CONFIG-DIR}} export DS_CONFIG_DIR -PIDFILE={{RUN-DIR}}/pid -STARTPIDFILE={{RUN-DIR}}/startpid +PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid +STARTPIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.startpid if test -f $STARTPIDFILE ; then PID=`cat $STARTPIDFILE` if kill -0 $PID > /dev/null 2>&1 ; then Index: template-stop-slapd.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-stop-slapd.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- template-stop-slapd.in 28 Nov 2006 17:13:48 -0000 1.3 +++ template-stop-slapd.in 26 Jan 2007 20:00:45 -0000 1.4 @@ -12,7 +12,7 @@ # 1: Server could not be stopped # 2: Server was not running -PIDFILE={{RUN-DIR}}/pid +PIDFILE={{RUN-DIR}}/{{PRODUCT-NAME}}-{{SERV-ID}}.pid if test ! -f $PIDFILE ; then echo No ns-slapd PID file found. Server is probably not running exit 2 From fedora-directory-commits at redhat.com Fri Jan 26 20:00:47 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 26 Jan 2007 15:00:47 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.40, 1.41 Message-ID: <200701262000.l0QK0ltS016743@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16696/ldapserver/ldap/admin/src Modified Files: create_instance.c Log Message: Resolves: bug 224606 Bug Description: Instance specific dirs should be in instance directory Reviewed by: nhosoi (Thanks!) Fix Description: Fixed create instance to create these instance specific directories: /var/lock/slapd-instance -> /var/lock/fedora-ds/slapd-instance /var/lib/slapd-instance -> /var/lib/fedora-ds/slapd-instance /var/log/slapd-instance -> /var/log/fedora-ds/slapd-instance /var/run/slapd-instance -> /var/run/fedora-ds For now, I'm side-stepping the question of what to do about permissions on /var/run/fedora-ds/slapd-instance.pid - we'll address this in the RPM creation. I've also moved the migration scripts to the %{_libdir}/fedora-ds/slapd-instance directory, and I've made the default directory for the key/cert db the same as the config directory. I think the dynamic nature of their configuration warrants the move. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- create_instance.c 25 Jan 2007 16:47:45 -0000 1.40 +++ create_instance.c 26 Jan 2007 20:00:40 -0000 1.41 @@ -754,7 +754,9 @@ table[12][1] = cf->config_dir; table[13][0] = "RUN-DIR"; table[13][1] = cf->run_dir; - table[14][0] = table[14][1] = NULL; + table[14][0] = "PRODUCT-NAME"; + table[14][1] = PRODUCT_NAME; + table[15][0] = table[15][1] = NULL; if (generate_script(ofn, fn, NEWSCRIPT_MODE, table) != 0) { return make_error("Could not write %s to %s (%s).", ofn, fn, @@ -764,76 +766,6 @@ return NULL; } -char *gen_perl_script_auto_for_migration(char *s_root, char *cs_path, char *name, - server_config_s *cf) -{ - char myperl[PATH_SIZE]; - char fn[PATH_SIZE], ofn[PATH_SIZE]; - const char *table[16][2]; - char *fnp = NULL; - int fnlen = 0; - - PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s", - cf->datadir, FILE_PATHSEP, cf->brand_ds, - FILE_PATHSEP, FILE_PATHSEP, name); - PR_snprintf(fn, sizeof(fn), "%s%c%s%cbin", - cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP); - create_instance_mkdir(fn, NEWDIR_MODE); - fnlen = strlen(fn); - fnp = fn + fnlen; - PR_snprintf(fnp, sizeof(fn) - fnlen, "%c%s", FILE_PATHSEP, name); - -#ifdef USE_NSPERL - PR_snprintf(myperl, sizeof(myperl), "!%s%cbin%cslapd%cadmin%cbin%cperl", - cf->prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, - FILE_PATHSEP, FILE_PATHSEP); -#else - strcpy(myperl, "!/usr/bin/env perl"); -#endif - - table[0][0] = "DS-ROOT"; - table[0][1] = cf->prefix; - table[1][0] = "DS-BRAND"; - table[1][1] = cf->brand_ds; - table[2][0] = "SEP"; - table[2][1] = FILE_PATHSEPP; - table[3][0] = "SERVER-NAME"; - table[3][1] = cf->servname; - table[4][0] = "SERVER-PORT"; - table[4][1] = cf->servport; - table[5][0] = "PERL-EXEC"; - table[6][0] = "DEV-NULL"; -#if !defined( XP_WIN32 ) - table[5][1] = myperl; - table[6][1] = " /dev/null "; -#else - table[5][1] = " perl script"; - table[6][1] = " NUL "; -#endif - table[7][0] = "ROOT-DN"; - table[7][1] = cf->rootdn; - table[8][0] = "LDIF-DIR"; - table[8][1] = cf->ldif_dir; - table[9][0] = "SERV-ID"; - table[9][1] = cf->servid; - - table[10][0] = "BAK-DIR"; - table[10][1] = cf->bak_dir; - table[11][0] = "SERVER-DIR"; - table[11][1] = cf->sroot; - table[12][0] = "CONFIG-DIR"; - table[12][1] = cf->config_dir; - table[13][0] = "RUN-DIR"; - table[13][1] = cf->run_dir; - table[14][0] = table[14][1] = NULL; - - if (generate_script(ofn, fn, NEWSCRIPT_MODE, table) != 0) { - return make_error("Could not write %s to %s (%s).", ofn, fn, - ds_system_errmsg()); - } - - return NULL; -} /* ------------------ NT utilities for server creation ------------------ */ @@ -1809,16 +1741,16 @@ gen_script_auto(mysroot, cs_path, _commandName, cf) #define CREATE_MIGRATE5TO7() \ - gen_perl_script_auto_for_migration(mysroot, mycs_path, "migrate5to7", cf) + gen_script_auto(mysroot, mycs_path, "migrate5to7", cf) #define CREATE_MIGRATE6TO7() \ - gen_perl_script_auto_for_migration(mysroot, mycs_path, "migrate6to7", cf) + gen_script_auto(mysroot, mycs_path, "migrate6to7", cf) #define CREATE_MIGRATEINSTANCE7() \ - gen_perl_script_auto_for_migration(mysroot, mycs_path, "migrateInstance7", cf) + gen_script_auto(mysroot, mycs_path, "migrateInstance7", cf) #define CREATE_MIGRATETO7() \ - gen_perl_script_auto_for_migration(mysroot, mycs_path, "migrateTo7", cf) + gen_script_auto(mysroot, mycs_path, "migrateTo7", cf) #define CREATE_NEWPWPOLICY() \ gen_script_auto(mysroot, mycs_path, "ns-newpwpolicy.pl", cf) @@ -4300,14 +4232,14 @@ * cf->datadir: %{_datadir} * cf->docdir: %{_docdir} * cf->inst_dir: /slapd- - * cf->config_dir: /lib/slapd- - * cf->schema_dir: /lib/slapd-/schema - * cf->lock_dir: /lock/slapd- - * cf->log_dir: /log/slapd- - * cf->run_dir: /run/slapd- - * cf->db_dir: /lib/slapd-/db - * cf->bak_dir: /lib/slapd-/bak - * cf->tmp_dir: /tmp/slapd- + * cf->config_dir: /lib/BRAND_DS/slapd- + * cf->schema_dir: /lib/BRAND_DS/slapd-/schema + * cf->lock_dir: /lock/BRAND_DS/slapd- + * cf->log_dir: /log/BRAND_DS/slapd- + * cf->run_dir: /run/BRAND_DS (slapd-instance.pid slapd-instance.startpid files) + * cf->db_dir: /lib/BRAND_DS/slapd-/db + * cf->bak_dir: /lib/BRAND_DS/slapd-/bak + * cf->tmp_dir: /tmp/BRAND_DS/slapd- * cf->ldif_dir: //ldif * cf->cert_dir: /BRAND_DS/slapd- * cf->sasl_path: /sasl2 @@ -4542,8 +4474,9 @@ temp = ds_a_get_cgi_var("config_dir", NULL, NULL); if (NULL == temp) { - cf->config_dir = PR_smprintf("%s%clib%c%s-%s", + cf->config_dir = PR_smprintf("%s%clib%c%s%c%s-%s", cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->brand_ds, FILE_PATHSEP, PRODUCT_NAME, cf->servid); } else { cf->config_dir = PL_strdup(temp); @@ -4554,8 +4487,9 @@ cf->schema_dir = ds_a_get_cgi_var("schema_dir", NULL, NULL); temp = ds_a_get_cgi_var("schema_dir", NULL, NULL); if (NULL == temp) { - cf->schema_dir = PR_smprintf("%s%clib%c%s-%s%cschema", + cf->schema_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cschema", cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->brand_ds, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); } else { cf->schema_dir = PL_strdup(temp); @@ -4563,8 +4497,9 @@ temp = ds_a_get_cgi_var("lock_dir", NULL, NULL); if (NULL == temp) { - cf->lock_dir = PR_smprintf("%s%clock%c%s-%s", + cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s", cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->brand_ds, FILE_PATHSEP, PRODUCT_NAME, cf->servid); } else { cf->lock_dir = PL_strdup(temp); @@ -4572,8 +4507,9 @@ temp = ds_a_get_cgi_var("log_dir", NULL, NULL); if (NULL == temp) { - cf->log_dir = PR_smprintf("%s%clog%c%s-%s", + cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s", cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->brand_ds, FILE_PATHSEP, PRODUCT_NAME, cf->servid); } else { cf->log_dir = PL_strdup(temp); @@ -4581,9 +4517,9 @@ temp = ds_a_get_cgi_var("run_dir", NULL, NULL); if (NULL == temp) { - cf->run_dir = PR_smprintf("%s%crun%c%s-%s", + cf->run_dir = PR_smprintf("%s%crun%c%s", cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, - PRODUCT_NAME, cf->servid); + cf->brand_ds); } else { cf->run_dir = PL_strdup(temp); } @@ -4592,8 +4528,9 @@ temp = ds_a_get_cgi_var("db_dir", NULL, NULL); if (NULL == temp) { - cf->db_dir = PR_smprintf("%s%clib%c%s-%s%cdb", + cf->db_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cdb", cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->brand_ds, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); } else { cf->db_dir = PL_strdup(temp); @@ -4601,8 +4538,9 @@ temp = ds_a_get_cgi_var("bak_dir", NULL, NULL); if (NULL == temp) { - cf->bak_dir = PR_smprintf("%s%clib%c%s-%s%cbak", + cf->bak_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cbak", cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->brand_ds, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); } else { cf->bak_dir = PL_strdup(temp); @@ -4613,15 +4551,16 @@ temp = ds_a_get_cgi_var("ldif_dir", NULL, NULL); if (NULL == temp) { cf->ldif_dir = PR_smprintf("%s%c%s%cldif", - cf->datadir, FILE_PATHSEP, BRAND_DS, FILE_PATHSEP); + cf->datadir, FILE_PATHSEP, cf->brand_ds, FILE_PATHSEP); } else { cf->ldif_dir = PL_strdup(temp); } temp = ds_a_get_cgi_var("tmp_dir", NULL, NULL); if (NULL == temp) { - cf->tmp_dir = PR_smprintf("%s%ctmp%c%s-%s", + cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s", cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->brand_ds, FILE_PATHSEP, PRODUCT_NAME, cf->servid); } else { cf->tmp_dir = PL_strdup(temp); @@ -4631,9 +4570,7 @@ temp = ds_a_get_cgi_var("cert_dir", NULL, NULL); if (NULL == temp) { - cf->cert_dir = PR_smprintf("%s%c%s%c%s-%s", - cf->sysconfdir, FILE_PATHSEP, cf->brand_ds, - FILE_PATHSEP, PRODUCT_NAME, cf->servid); + cf->cert_dir = PL_strdup(cf->config_dir); } else { cf->cert_dir = PL_strdup(temp); } From fedora-directory-commits at redhat.com Fri Jan 26 20:00:42 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 26 Jan 2007 15:00:42 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/lib dsalib_updown.c, 1.8, 1.9 Message-ID: <200701262001.l0QK1Cbu018290@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16696/ldapserver/ldap/admin/lib Modified Files: dsalib_updown.c Log Message: Resolves: bug 224606 Bug Description: Instance specific dirs should be in instance directory Reviewed by: nhosoi (Thanks!) Fix Description: Fixed create instance to create these instance specific directories: /var/lock/slapd-instance -> /var/lock/fedora-ds/slapd-instance /var/lib/slapd-instance -> /var/lib/fedora-ds/slapd-instance /var/log/slapd-instance -> /var/log/fedora-ds/slapd-instance /var/run/slapd-instance -> /var/run/fedora-ds For now, I'm side-stepping the question of what to do about permissions on /var/run/fedora-ds/slapd-instance.pid - we'll address this in the RPM creation. I've also moved the migration scripts to the %{_libdir}/fedora-ds/slapd-instance directory, and I've made the default directory for the key/cert db the same as the config directory. I think the dynamic nature of their configuration warrants the move. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: dsalib_updown.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_updown.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dsalib_updown.c 10 Nov 2006 23:44:32 -0000 1.8 +++ dsalib_updown.c 26 Jan 2007 20:00:40 -0000 1.9 @@ -95,7 +95,7 @@ fprintf(stderr, "ds_get_updown_status: could not get install root\n"); return(DS_SERVER_UNKNOWN); } - PR_snprintf(pid_file_name, BIG_LINE, "%s/pid", rundir); + PR_snprintf(pid_file_name, BIG_LINE, "%s/%s.pid", ds_get_server_name(), rundir); pidfile = fopen(pid_file_name, "r"); if ( pidfile == NULL ) { /* From fedora-directory-commits at redhat.com Fri Jan 26 20:54:35 2007 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 26 Jan 2007 15:54:35 -0500 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.16, 1.17 Makefile.in, 1.17, 1.18 aclocal.m4, 1.8, 1.9 compile, 1.5, 1.6 config.guess, 1.4, 1.5 config.sub, 1.4, 1.5 configure, 1.17, 1.18 depcomp, 1.5, 1.6 install-sh, 1.5, 1.6 ltmain.sh, 1.3, 1.4 missing, 1.5, 1.6 Message-ID: <200701262054.l0QKsZCe020596@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20537 Modified Files: Makefile.am Makefile.in aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh missing Log Message: Resolves: 223861 Summary: Nightly build uses autotools/yum (Comment #5) Change: Adding logconv.pl to Makefile.am Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.am 25 Jan 2007 16:47:45 -0000 1.16 +++ Makefile.am 26 Jan 2007 20:54:32 -0000 1.17 @@ -136,6 +136,7 @@ wrappers/migratecred \ wrappers/mmldif \ wrappers/pwdhash \ + $(srcdir)/ldap/admin/src/logconv.pl \ $(srcdir)/ldap/admin/src/ds_newinst.pl task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \ View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.17 -r 1.18 Makefile.in Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile.in 25 Jan 2007 16:47:45 -0000 1.17 +++ Makefile.in 26 Jan 2007 20:54:32 -0000 1.18 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +18,8 @@ +SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) $(migratecred_bin_SOURCES)! $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -675,19 +677,19 @@ am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \ $(libacl_plugin_la_SOURCES) \ @@ -811,7 +813,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_FALSE = @SOLARIS_FALSE@ @@ -1014,6 +1015,7 @@ wrappers/migratecred \ wrappers/mmldif \ wrappers/pwdhash \ + $(srcdir)/ldap/admin/src/logconv.pl \ $(srcdir)/ldap/admin/src/ds_newinst.pl task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \ @@ -5012,2279 +5014,2279 @@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi` ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acl.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo: ldap/servers/plugins/acl/acl_ext.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acl_ext.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.lo `test -f 'ldap/servers/plugins/acl/acl_ext.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl_ext.c ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo: ldap/servers/plugins/acl/aclanom.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclanom.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclanom.lo `test -f 'ldap/servers/plugins/acl/aclanom.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclanom.c ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo: ldap/servers/plugins/acl/acleffectiverights.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acleffectiverights.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acleffectiverights.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acleffectiverights.lo `test -f 'ldap/servers/plugins/acl/acleffectiverights.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acleffectiverights.c ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo: ldap/servers/plugins/acl/aclgroup.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclgroup.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclgroup.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclgroup.lo `test -f 'ldap/servers/plugins/acl/aclgroup.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclgroup.c ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo: ldap/servers/plugins/acl/aclinit.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclinit.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclinit.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclinit.lo `test -f 'ldap/servers/plugins/acl/aclinit.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclinit.c ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo: ldap/servers/plugins/acl/acllas.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllas.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acllas.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllas.lo `test -f 'ldap/servers/plugins/acl/acllas.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllas.c ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo: ldap/servers/plugins/acl/acllist.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acllist.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/acllist.c' object='ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-acllist.lo `test -f 'ldap/servers/plugins/acl/acllist.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acllist.c ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo: ldap/servers/plugins/acl/aclparse.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclparse.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclparse.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclparse.lo `test -f 'ldap/servers/plugins/acl/aclparse.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclparse.c ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo: ldap/servers/plugins/acl/aclplugin.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclplugin.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclplugin.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclplugin.lo `test -f 'ldap/servers/plugins/acl/aclplugin.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclplugin.c ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo: ldap/servers/plugins/acl/aclproxy.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclproxy.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclproxy.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclproxy.lo `test -f 'ldap/servers/plugins/acl/aclproxy.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclproxy.c ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo: ldap/servers/plugins/acl/aclutil.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclutil.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/acl/aclutil.c' object='ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/acl/libacl_plugin_la-aclutil.lo `test -f 'ldap/servers/plugins/acl/aclutil.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/aclutil.c ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo: ldap/servers/plugins/uiduniq/7bit.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-7bit.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/uiduniq/7bit.c' object='ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-7bit.lo `test -f 'ldap/servers/plugins/uiduniq/7bit.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/7bit.c ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo: ldap/servers/plugins/uiduniq/uid.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo -MD -MP -MF "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo" "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Plo"; else rm -f "ldap/servers/plugins/uiduniq/$(DEPDIR)/libattr_unique_plugin_la-uid.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/uiduniq/uid.c' object='ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c + at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/uiduniq/libattr_unique_plugin_la-uid.lo `test -f 'ldap/servers/plugins/uiduniq/uid.c' || echo '$(srcdir)/'`ldap/servers/plugins/uiduniq/uid.c ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo: ldap/servers/plugins/shared/utils.c - at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo -MD -MP -MF "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo" -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c; \ + at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libattr_unique_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo -MD -MP -MF "ldap/servers/plugins/shared/$(DEPDIR)/libattr_unique_plugin_la-utils.Tpo" -c -o ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo `test -f 'ldap/servers/plugins/shared/utils.c' || echo '$(srcdir)/'`ldap/servers/plugins/shared/utils.c; \ [...2963 lines suppressed...] lib/libaccess/libns_dshttpd_la-nseframe.lo: lib/libaccess/nseframe.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nseframe.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nseframe.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/nseframe.cpp' object='lib/libaccess/libns_dshttpd_la-nseframe.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nseframe.lo `test -f 'lib/libaccess/nseframe.cpp' || echo '$(srcdir)/'`lib/libaccess/nseframe.cpp lib/libaccess/libns_dshttpd_la-nsautherr.lo: lib/libaccess/nsautherr.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-nsautherr.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-nsautherr.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/nsautherr.cpp' object='lib/libaccess/libns_dshttpd_la-nsautherr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-nsautherr.lo `test -f 'lib/libaccess/nsautherr.cpp' || echo '$(srcdir)/'`lib/libaccess/nsautherr.cpp lib/libaccess/libns_dshttpd_la-oneeval.lo: lib/libaccess/oneeval.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-oneeval.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-oneeval.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/oneeval.cpp' object='lib/libaccess/libns_dshttpd_la-oneeval.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-oneeval.lo `test -f 'lib/libaccess/oneeval.cpp' || echo '$(srcdir)/'`lib/libaccess/oneeval.cpp lib/libaccess/libns_dshttpd_la-register.lo: lib/libaccess/register.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-register.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-register.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/register.cpp' object='lib/libaccess/libns_dshttpd_la-register.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-register.lo `test -f 'lib/libaccess/register.cpp' || echo '$(srcdir)/'`lib/libaccess/register.cpp lib/libaccess/libns_dshttpd_la-symbols.lo: lib/libaccess/symbols.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-symbols.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-symbols.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/symbols.cpp' object='lib/libaccess/libns_dshttpd_la-symbols.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-symbols.lo `test -f 'lib/libaccess/symbols.cpp' || echo '$(srcdir)/'`lib/libaccess/symbols.cpp lib/libaccess/libns_dshttpd_la-usi.lo: lib/libaccess/usi.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usi.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usi.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/usi.cpp' object='lib/libaccess/libns_dshttpd_la-usi.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usi.lo `test -f 'lib/libaccess/usi.cpp' || echo '$(srcdir)/'`lib/libaccess/usi.cpp lib/libaccess/libns_dshttpd_la-usrcache.lo: lib/libaccess/usrcache.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/libaccess/libns_dshttpd_la-usrcache.lo -MD -MP -MF "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo" "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Plo"; else rm -f "lib/libaccess/$(DEPDIR)/libns_dshttpd_la-usrcache.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/libaccess/usrcache.cpp' object='lib/libaccess/libns_dshttpd_la-usrcache.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/libaccess/libns_dshttpd_la-usrcache.lo `test -f 'lib/libaccess/usrcache.cpp' || echo '$(srcdir)/'`lib/libaccess/usrcache.cpp lib/base/libns_dshttpd_la-crit.lo: lib/base/crit.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-crit.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-crit.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/crit.cpp' object='lib/base/libns_dshttpd_la-crit.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-crit.lo `test -f 'lib/base/crit.cpp' || echo '$(srcdir)/'`lib/base/crit.cpp lib/base/libns_dshttpd_la-dns.lo: lib/base/dns.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dns.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dns.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/dns.cpp' object='lib/base/libns_dshttpd_la-dns.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dns.lo `test -f 'lib/base/dns.cpp' || echo '$(srcdir)/'`lib/base/dns.cpp lib/base/libns_dshttpd_la-dnsdmain.lo: lib/base/dnsdmain.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-dnsdmain.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-dnsdmain.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/dnsdmain.cpp' object='lib/base/libns_dshttpd_la-dnsdmain.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-dnsdmain.lo `test -f 'lib/base/dnsdmain.cpp' || echo '$(srcdir)/'`lib/base/dnsdmain.cpp lib/base/libns_dshttpd_la-ereport.lo: lib/base/ereport.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-ereport.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-ereport.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/ereport.cpp' object='lib/base/libns_dshttpd_la-ereport.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-ereport.lo `test -f 'lib/base/ereport.cpp' || echo '$(srcdir)/'`lib/base/ereport.cpp lib/base/libns_dshttpd_la-file.lo: lib/base/file.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-file.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-file.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/file.cpp' object='lib/base/libns_dshttpd_la-file.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-file.lo `test -f 'lib/base/file.cpp' || echo '$(srcdir)/'`lib/base/file.cpp lib/base/libns_dshttpd_la-fsmutex.lo: lib/base/fsmutex.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-fsmutex.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-fsmutex.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/fsmutex.cpp' object='lib/base/libns_dshttpd_la-fsmutex.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-fsmutex.lo `test -f 'lib/base/fsmutex.cpp' || echo '$(srcdir)/'`lib/base/fsmutex.cpp lib/base/libns_dshttpd_la-lexer.lo: lib/base/lexer.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-lexer.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-lexer.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/lexer.cpp' object='lib/base/libns_dshttpd_la-lexer.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-lexer.lo `test -f 'lib/base/lexer.cpp' || echo '$(srcdir)/'`lib/base/lexer.cpp lib/base/libns_dshttpd_la-net.lo: lib/base/net.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-net.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-net.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/net.cpp' object='lib/base/libns_dshttpd_la-net.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-net.lo `test -f 'lib/base/net.cpp' || echo '$(srcdir)/'`lib/base/net.cpp lib/base/libns_dshttpd_la-plist.lo: lib/base/plist.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-plist.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-plist.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/plist.cpp' object='lib/base/libns_dshttpd_la-plist.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-plist.lo `test -f 'lib/base/plist.cpp' || echo '$(srcdir)/'`lib/base/plist.cpp lib/base/libns_dshttpd_la-pool.lo: lib/base/pool.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-pool.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-pool.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/pool.cpp' object='lib/base/libns_dshttpd_la-pool.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-pool.lo `test -f 'lib/base/pool.cpp' || echo '$(srcdir)/'`lib/base/pool.cpp lib/base/libns_dshttpd_la-rwlock.lo: lib/base/rwlock.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-rwlock.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-rwlock.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/rwlock.cpp' object='lib/base/libns_dshttpd_la-rwlock.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-rwlock.lo `test -f 'lib/base/rwlock.cpp' || echo '$(srcdir)/'`lib/base/rwlock.cpp lib/base/libns_dshttpd_la-shexp.lo: lib/base/shexp.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-shexp.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-shexp.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/shexp.cpp' object='lib/base/libns_dshttpd_la-shexp.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-shexp.lo `test -f 'lib/base/shexp.cpp' || echo '$(srcdir)/'`lib/base/shexp.cpp lib/base/libns_dshttpd_la-system.lo: lib/base/system.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-system.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-system.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/system.cpp' object='lib/base/libns_dshttpd_la-system.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-system.lo `test -f 'lib/base/system.cpp' || echo '$(srcdir)/'`lib/base/system.cpp lib/base/libns_dshttpd_la-systhr.lo: lib/base/systhr.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-systhr.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-systhr.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/systhr.cpp' object='lib/base/libns_dshttpd_la-systhr.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-systhr.lo `test -f 'lib/base/systhr.cpp' || echo '$(srcdir)/'`lib/base/systhr.cpp lib/base/libns_dshttpd_la-util.lo: lib/base/util.cpp - at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \ + at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lib/base/libns_dshttpd_la-util.lo -MD -MP -MF "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp; \ @am__fastdepCXX_TRUE@ then mv -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo" "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Plo"; else rm -f "lib/base/$(DEPDIR)/libns_dshttpd_la-util.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/base/util.cpp' object='lib/base/libns_dshttpd_la-util.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp + at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lib/base/libns_dshttpd_la-util.lo `test -f 'lib/base/util.cpp' || echo '$(srcdir)/'`lib/base/util.cpp mostlyclean-libtool: -rm -f *.lo View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aclocal.m4 25 Jan 2007 16:47:45 -0000 1.8 +++ aclocal.m4 26 Jan 2007 20:54:32 -0000 1.9 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.9.2 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 AC_PROG_LIBTOOL +# serial 47 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -123,7 +123,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -143,7 +143,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a `.a' archive for static linking (except M$VC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -163,7 +163,6 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -183,17 +182,15 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -_LT_CC_BASENAME([$compiler]) - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -234,56 +231,11 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_LINKER_BOILERPLATE - - # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -356,15 +308,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -533,7 +485,7 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in x86_64-*linux*) @@ -584,22 +536,6 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -631,7 +567,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -641,10 +577,8 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings [...3358 lines suppressed...] -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 4 +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -7032,16 +6694,27 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# + +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -7095,15 +6768,26 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -# serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -7128,16 +6812,28 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Check to make sure that the build environment is sane. +# + +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -# serial 4 +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 # AM_SANITY_CHECK # --------------- @@ -7180,14 +6876,25 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_INSTALL_STRIP -# --------------------- + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -7210,13 +6917,25 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 -# serial 2 # _AM_PROG_TAR(FORMAT) # -------------------- Index: compile =================================================================== RCS file: /cvs/dirsec/ldapserver/compile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- compile 16 Nov 2006 18:56:03 -0000 1.5 +++ compile 26 Jan 2007 20:54:32 -0000 1.6 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2005-05-14.22 +scriptversion=2004-09-10.20 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -47,11 +47,11 @@ Report bugs to . EOF - exit $? + exit 0 ;; -v | --v*) echo "compile $scriptversion" - exit $? + exit 0 ;; esac @@ -125,8 +125,6 @@ if test -f "$cofile"; then mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" Index: config.guess =================================================================== RCS file: /cvs/dirsec/ldapserver/config.guess,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config.guess 15 Nov 2006 17:17:37 -0000 1.4 +++ config.guess 26 Jan 2007 20:54:32 -0000 1.5 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,15 +17,13 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -55,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -68,11 +66,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -125,7 +123,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi at noc.rutgers.edu 1994-08-24) @@ -198,20 +196,55 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit ;; + exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; + exit 0 ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -264,43 +297,37 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit ;; + exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit ;; + exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit ;; + exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + exit 0 ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit ;; + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + exit 0;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit ;; + exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -308,32 +335,32 @@ else echo pyramid-pyramid-bsd fi - exit ;; + exit 0 ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit ;; + exit 0 ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; + sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -342,10 +369,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + exit 0 ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -357,10 +384,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit ;; + exit 0 ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -371,40 +398,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit ;; + exit 0 ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -428,33 +455,32 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit ;; + exit 0 ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit ;; + exit 0 ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit ;; + exit 0 ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit ;; + exit 0 ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -470,29 +496,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit ;; + exit 0 ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit ;; + exit 0 ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit ;; + exit 0 ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit ;; + exit 0 ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -500,7 +526,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -515,18 +541,14 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit ;; + exit 0 ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -540,28 +562,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix - exit ;; + exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit ;; + exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit ;; + exit 0 ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit ;; + exit 0 ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit ;; + exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit ;; + exit 0 ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -623,19 +645,9 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -643,11 +655,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -675,166 +687,158 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 - exit ;; + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit ;; + exit 0 ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit ;; + exit 0 ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit ;; + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit ;; + exit 0 ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit ;; + exit 0 ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit ;; + exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit ;; + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + exit 0 ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + exit 0 ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit ;; + exit 0 ;; x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit ;; + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit ;; + exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit ;; + exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + exit 0 ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit ;; + exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit ;; + exit 0 ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit ;; + exit 0 ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit ;; + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -852,7 +856,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -871,14 +875,14 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit ;; + exit 0 ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit ;; + exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -892,7 +896,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; + exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -900,25 +904,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit ;; + exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit ;; + exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit ;; + exit 0 ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit ;; + exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -936,15 +940,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; + exit 0 ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; + exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -972,18 +976,15 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit ;; + exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -991,27 +992,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; + exit 0 ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit ;; + exit 0 ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) + exit 0 ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit ;; + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1019,16 +1020,15 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + exit 0 ;; + i*86:*:5:[78]*) case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit ;; + exit 0 ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit ;; + exit 0 ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit ;; + exit 0 ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit ;; + exit 0 ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit ;; + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + exit 0 ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,65 +1120,61 @@ else echo ns32k-sni-sysv fi - exit ;; + exit 0 ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit ;; + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit ;; + exit 0 ;; *:*:*:FTX*) # From seanf at swdc.stratus.com. echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green at stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + exit 0 ;; *:VOS:*:*) # From Paul.Green at stratus.com. echo hppa1.1-stratus-vos - exit ;; + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + exit 0 ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit ;; + exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit ;; + exit 0 ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit ;; + exit 0 ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit ;; + exit 0 ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in @@ -1186,7 +1182,7 @@ unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1194,25 +1190,22 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit ;; + exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit ;; + exit 0 ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1223,44 +1216,38 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit ;; + exit 0 ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit ;; + exit 0 ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit ;; + exit 0 ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit ;; + exit 0 ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit ;; + exit 0 ;; *:ITS:*:*) echo pdp10-unknown-its - exit ;; + exit 0 ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + exit 0 ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1292,7 +1279,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); + printf ("arm-acorn-riscix"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1381,12 +1368,11 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } # Convex versions that predate uname can use getsysinfo(1) @@ -1395,22 +1381,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit ;; + exit 0 ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; c34*) echo c34-convex-bsd - exit ;; + exit 0 ;; c38*) echo c38-convex-bsd - exit ;; + exit 0 ;; c4*) echo c4-convex-bsd - exit ;; + exit 0 ;; esac fi @@ -1421,9 +1407,7 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please send the following data and any information you think might be Index: config.sub =================================================================== RCS file: /cvs/dirsec/ldapserver/config.sub,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config.sub 15 Nov 2006 17:17:37 -0000 1.4 +++ config.sub 26 Jan 2007 20:54:32 -0000 1.5 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,15 +21,14 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -71,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -84,11 +83,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -100,7 +99,7 @@ *local*) # First pass through any local machine types. echo $1 - exit ;; + exit 0;; * ) break ;; @@ -232,14 +231,13 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -248,7 +246,6 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -257,28 +254,23 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ | msp430 \ | ns16k | ns32k \ - | or32 \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -306,7 +298,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bfin-* | bs2000-* \ + | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -318,7 +310,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -327,7 +319,6 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -336,7 +327,6 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -344,23 +334,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ - | sparclite-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -502,10 +489,6 @@ basic_machine=m88k-motorola os=-sysv3 ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -771,8 +754,9 @@ basic_machine=hppa1.1-oki os=-proelf ;; - openrisc | openrisc-*) + or32 | or32-*) basic_machine=or32-unknown + os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1045,10 +1029,6 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1098,9 +1078,12 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; + sh64) + basic_machine=sh64-unknown + ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1187,8 +1170,7 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1206,7 +1188,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1315,9 +1297,6 @@ -kaos*) os=-kaos ;; - -zvmoe) - os=-zvmoe - ;; -none) ;; *) @@ -1395,9 +1374,6 @@ *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1569,7 +1545,7 @@ esac echo $basic_machine$os -exit +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.17 -r 1.18 configure Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- configure 25 Jan 2007 16:47:45 -0000 1.17 +++ configure 26 Jan 2007 20:54:32 -0000 1.18 @@ -280,15 +280,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -465,7 +465,7 @@ #endif" ac_default_prefix=/opt/fedora-ds -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3819,13 +3819,12 @@ done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f $lt_ac_sed && break cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -3850,11 +3849,10 @@ fi done done +SED=$lt_cv_path_SED fi -SED=$lt_cv_path_SED - echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -3931,7 +3929,7 @@ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then lt_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. + # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &6 else - # I'd rather use --version here, but apparently some GNU lds only accept -v. + # I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 &5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -4014,43 +4003,36 @@ # Let the user override the test. lt_cv_path_NM="$NM" else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/${ac_tool_prefix}nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" break ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags ;; esac - fi - done - IFS="$lt_save_ifs" + esac + fi done + IFS="$lt_save_ifs" test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi @@ -4097,7 +4079,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi[45]*) +bsdi4*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -4120,13 +4102,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -4142,7 +4124,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in + case "$host_cpu" in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so [...14192 lines suppressed...] -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -17939,18 +18505,12 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_GCJ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -18010,7 +18570,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -18084,11 +18644,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_GCJ # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_GCJ # Dependencies to place before the objects being linked to create a # shared library. @@ -18100,7 +18660,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18180,7 +18740,7 @@ link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -18254,42 +18814,15 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - # Allow CC to be a program name with arguments. compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -18305,7 +18838,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ @@ -18406,12 +18939,6 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18423,18 +18950,12 @@ # A C compiler. LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - # A language-specific compiler. CC=$lt_compiler_RC # Is the compiler the GNU C compiler? with_gcc=$GCC_RC -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -18494,7 +19015,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -18568,11 +19089,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_RC # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_RC # Dependencies to place before the objects being linked to create a # shared library. @@ -18584,7 +19105,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_RC # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18664,7 +19185,7 @@ link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -25533,7 +26054,6 @@ s, at CCDEPMODE@,$CCDEPMODE,;t t s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s, at SED@,$SED,;t t s, at EGREP@,$EGREP,;t t s, at LN_S@,$LN_S,;t t s, at ECHO@,$ECHO,;t t Index: depcomp =================================================================== RCS file: /cvs/dirsec/ldapserver/depcomp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- depcomp 16 Nov 2006 18:56:03 -0000 1.5 +++ depcomp 26 Jan 2007 20:54:32 -0000 1.6 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2004-05-31.23 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -50,11 +50,11 @@ Report bugs to . EOF - exit $? + exit 0 ;; -v | --v*) echo "depcomp $scriptversion" - exit $? + exit 0 ;; esac @@ -287,43 +287,36 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + elif test -f "$tmpdepfile2"; then + tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" + fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. @@ -467,8 +460,7 @@ done "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" Index: install-sh =================================================================== RCS file: /cvs/dirsec/ldapserver/install-sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- install-sh 16 Nov 2006 18:56:03 -0000 1.5 +++ install-sh 26 Jan 2007 20:54:32 -0000 1.6 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2004-09-10.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -109,7 +109,7 @@ shift continue;; - --help) echo "$usage"; exit $?;; + --help) echo "$usage"; exit 0;; -m) chmodcmd="$chmodprog $2" shift @@ -134,7 +134,7 @@ shift continue;; - --version) echo "$0 $scriptversion"; exit $?;; + --version) echo "$0 $scriptversion"; exit 0;; *) # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -213,7 +213,7 @@ fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -226,8 +226,7 @@ oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` IFS=$oIFS pathcomp= @@ -296,7 +295,7 @@ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 + (exit 1); exit } else : @@ -307,12 +306,12 @@ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } } - fi || { (exit 1); exit 1; } + fi || { (exit 1); exit; } done # The final little trick to "correctly" pass the exit status to the exit trap. { - (exit 0); exit 0 + (exit 0); exit } # Local variables: Index: ltmain.sh =================================================================== RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ltmain.sh 12 Jan 2007 16:18:15 -0000 1.3 +++ ltmain.sh 26 Jan 2007 20:54:32 -0000 1.4 @@ -46,16 +46,10 @@ VERSION=1.5.22 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes. +if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi # Check that we have a working $echo. @@ -111,14 +105,12 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - fi" -done +if test "${LC_ALL+set}" = set; then + save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL +fi +if test "${LANG+set}" = set; then + save_LANG="$LANG"; LANG=C; export LANG +fi # Make sure IFS has a sensible default lt_nl=' @@ -144,8 +136,6 @@ preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 ##################################### # Shell function definitions: @@ -337,17 +327,7 @@ *) my_xabs=`pwd`"/$my_xlib" ;; esac my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - extracted_serial=`expr $extracted_serial + 1` - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir="$my_gentop/$my_xlib" $show "${rm}r $my_xdir" $run ${rm}r "$my_xdir" @@ -778,7 +758,6 @@ *.f90) xform=f90 ;; *.for) xform=for ;; *.java) xform=java ;; - *.obj) xform=obj ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -1159,9 +1138,8 @@ for arg do case $arg in - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) + -all-static | -static) + if test "X$arg" = "X-all-static"; then if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1169,20 +1147,12 @@ dlopen_self=$dlopen_self_static fi prefer_static_libs=yes - ;; - -static) + else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac + fi build_libtool_libs=no build_old_libs=yes break @@ -1742,7 +1712,7 @@ continue ;; - -static | -static-libtool-libs) + -static) # The effects of -static are defined in a previous loop. # We used to do the same as -all-static on platforms that # didn't have a PIC flag, but the assumption that the effects @@ -2520,9 +2490,7 @@ if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -3218,7 +3186,7 @@ # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows|none) + darwin|linux|osf|windows) current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_revision" @@ -3442,11 +3410,11 @@ fi # Eliminate all temporary directories. -# for path in $notinst_path; do -# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` -# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` -# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` -# done + for path in $notinst_path; do + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3547,12 +3515,13 @@ int main() { return 0; } EOF $rm conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs + if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" != "0"; then + if test "$name" != "" && test "$name" -ne "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) @@ -3591,7 +3560,9 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $i; then + $LTCC $LTCFLAGS -o conftest conftest.c $i + # Did it work? + if test "$?" -eq 0 ; then ldd_output=`ldd conftest` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in @@ -3623,7 +3594,7 @@ droppeddeps=yes $echo $echo "*** Warning! Library $i is needed by this library but I was not able to" - $echo "*** make it link in! You will probably need to install it or some" + $echo "*** make it link in! You will probably need to install it or some" $echo "*** library that it depends on before this library will be fully" $echo "*** functional. Installing it before continuing would be even better." fi @@ -4268,14 +4239,12 @@ reload_conv_objs= gentop= # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. + # -Wl from whole_archive_flag_spec wl= if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -4723,16 +4692,16 @@ case $host in *cygwin* | *mingw* ) if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` else - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` fi ;; * ) - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ;; esac ;; @@ -4747,13 +4716,13 @@ # really was required. # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` + compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. @@ -4840,7 +4809,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -4877,7 +4846,7 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` + relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi # Quote $echo for shipping. @@ -5284,18 +5253,6 @@ Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi - # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH @@ -5438,7 +5395,7 @@ ;; esac $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \$*\" + \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" exit $EXIT_FAILURE fi else @@ -5624,7 +5581,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` + relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -5969,9 +5926,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` + relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` + relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi $echo "$modename: warning: relinking \`$file'" 1>&2 @@ -6180,7 +6137,7 @@ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` + relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` $show "$relink_command" if $run eval "$relink_command"; then : @@ -6456,15 +6413,12 @@ fi # Restore saved environment variables - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - + if test "${save_LC_ALL+set}" = set; then + LC_ALL="$save_LC_ALL"; export LC_ALL + fi + if test "${save_LANG+set}" = set; then + LANG="$save_LANG"; export LANG + fi # Now prepare to actually exec the command. exec_cmd="\$cmd$args" @@ -6821,9 +6775,9 @@ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE + try to export only the symbols listed in SYMFILE -export-symbols-regex REGEX - try to export only the symbols matching REGEX + try to export only the symbols matching REGEX -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened @@ -6837,11 +6791,9 @@ -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries + -static do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] + specify library version info [each variable defaults to 0] All other options (arguments beginning with \`-') are ignored. Index: missing =================================================================== RCS file: /cvs/dirsec/ldapserver/missing,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- missing 16 Nov 2006 18:56:03 -0000 1.5 +++ missing 26 Jan 2007 20:54:32 -0000 1.6 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2004-09-07.08 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,12 +87,12 @@ yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to ." - exit $? + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" - exit $? + exit 0 ;; -*) @@ -288,18 +288,11 @@ call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 + file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` + fi touch $file ;; From fedora-directory-commits at redhat.com Mon Jan 29 16:46:27 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 29 Jan 2007 11:46:27 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd ssl.c, 1.11, 1.12 Message-ID: <200701291646.l0TGkRCH006007@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5976/ldapserver/ldap/servers/slapd Modified Files: ssl.c Log Message: Resolves: bug 224672 Bug Description: Get rid of key/cert db prefix Reviewed by: nhosoi (Thanks!) Fix Description: Now that we have everything in its own instance specific directory, we do not need the troublesome key/cert database prefix. This simplifies the slapd_nss_init code a great deal. Platforms tested: RHEL4 Flag Day: no Doc impact: YES - A couple of the pages on the wiki talk about slapd-instance-cert8.db and so on - these pages will have to change once FDS 1.1 is released Index: ssl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ssl.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ssl.c 10 Nov 2006 23:45:40 -0000 1.11 +++ ssl.c 29 Jan 2007 16:46:25 -0000 1.12 @@ -424,146 +424,68 @@ * config. entries from dse.ldif are NOT available (used only when * running in referral mode). * As of DS6.1, the init_ssl flag passed is ignored. + * + * richm 20070126 - By default now we put the key/cert db files + * in an instance specific directory (the certdir directory) so + * we do not need a prefix any more. */ int slapd_nss_init(int init_ssl, int config_available) { SECStatus secStatus; PRErrorCode errorCode; - char *keyfn = NULL; - char *certfn = NULL; - char *val = NULL; - char certPref[1024]; - char keyPref[1024]; - char path[1024]; + PRStatus status; int rv = 0; int len = 0; PRUint32 nssFlags = 0; - Slapi_Entry *ec = NULL; char *certdir; - if (config_available) { - getConfigEntry( configDN, &ec ); - } - - if ( ec != NULL ) { - certfn = slapi_entry_attr_get_charptr( ec, "nscertfile" ); - keyfn = slapi_entry_attr_get_charptr( ec, "nskeyfile" ); - slapi_entry_free (ec); - ec = NULL; - } - /* set in slapd_bootstrap_config, thus certdir is available even if config_available is false */ certdir = config_get_certdir(); - PL_strncpyz(path, certdir, sizeof(path)); - slapi_ch_free_string(&certdir); /* make sure path does not end in the path separator character */ - len = strlen(path); - if (path[len-1] == '/' || path[len-1] == '\\') { - path[len-1] = '\0'; - } - - /* get the server instance dir name from path: - /BRAND_DS/slapd- */ - val = strrchr(path, '/'); - if (!val) { - val = strrchr(path, '\\'); - } - val++; - - if (keyfn && certfn) { - if (is_abspath(certfn)) { - warn_if_no_cert_file(certfn); - /* first, initialize path from the certfn */ - PL_strncpyz(path, certfn, sizeof(path)); - /* extract path from cert db filename */ - val = strrchr(path, '/'); - if (!val) { - val = strrchr(path, '\\'); - } - *val = 0; /* path is initialized */ - /* next, init the cert db prefix */ - val++; - PL_strncpyz(certPref, val, sizeof(certPref)); - } else { - PL_strncpyz(val, certfn, sizeof(path)-(val-path)); - warn_if_no_cert_file(path); /* assumes certfn is relative to server root */ - val = strrchr(path, '/'); - if (!val) { - val = strrchr(path, '\\'); - } - val++; - PL_strncpyz(certPref, val, sizeof(certPref)); - *val = '\0'; - } - /* path represents now the base directory where cert, key, pin, and module db live */ - /* richm - use strrstr to get the last occurance of -cert in the string, in case - the instance is named slapd-cert - the certdb name will be slapd-cert-cert7.db - */ - val = PL_strrstr(certPref, "-cert"); - val++; - *val = '\0'; - /* certPref keeps the prefix added to the cert db, usually "slapd-myserver-" */ - - /* now find the key db prefix */ - val = strrchr(keyfn, '/'); - if (!val) { - val = strrchr(keyfn, '\\'); - } - if (val != NULL) { - val++; - } else { - val = keyfn; - } - PL_strncpyz(keyPref, val, sizeof(keyPref)); - warn_if_no_key_file(path, keyPref); - /* richm - use strrstr to get the last occurance of -key in the string, in case - the instance is named slapd-key - the keydb name will be slapd-key-key3.db - */ - val = PL_strrstr(keyPref, "-key"); - val++; - *val = '\0'; - /* keypref keeps the prefix added to the key db, usually "slapd-myserver-" */ - } else { - if ( config_get_security() ) { - /* Have to have the key and cert file names to enable an SSL port */ - errorCode = PR_GetError(); - slapd_SSL_warn("Security Initialization: Failed to retrieve SSL " - "configuration information (" - SLAPI_COMPONENT_NAME_NSPR " error %d - %s): " - "nskeyfile: %s, nscertfile: %s ", - errorCode, slapd_pr_strerror(errorCode), - (keyfn ? "found" : "not found"), - (certfn ? "found" : "not found")); - } - PR_snprintf(certPref, sizeof(certPref), "%s-", val); - PL_strncpyz(keyPref, certPref, sizeof(keyPref)); + len = strlen(certdir); + if (certdir[len-1] == '/' || certdir[len-1] == '\\') { + certdir[len-1] = '\0'; } - slapi_ch_free((void **) &certfn); - slapi_ch_free((void **) &keyfn); + /* we open the key/cert db in rw mode, so make sure the directory + is writable */ + if (PR_SUCCESS != (status = PR_Access(certdir, PR_ACCESS_WRITE_OK))) { + char *serveruser = "unknown"; +#ifndef _WIN32 + serveruser = config_get_localuser(); +#endif + slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization", + "Warning: The key/cert database directory [%s] is not writable by " + "the server uid [%s]: initialization likely to fail.\n", + certdir, serveruser); +#ifndef _WIN32 + slapi_ch_free_string(&serveruser); +#endif + } /******** Initialise NSS *********/ nssFlags &= (~NSS_INIT_READONLY); slapd_pk11_configurePKCS11(NULL, NULL, tokDes, ptokDes, NULL, NULL, NULL, NULL, 0, 0 ); - secStatus = NSS_Initialize(path, certPref, keyPref, "secmod.db", nssFlags); + secStatus = NSS_Initialize(certdir, NULL, NULL, "secmod.db", nssFlags); - dongle_file_name = PR_smprintf("%s/%spin.txt", path, certPref); + dongle_file_name = PR_smprintf("%s/pin.txt", certdir); if (secStatus != SECSuccess) { errorCode = PR_GetError(); slapd_SSL_warn("Security Initialization: NSS initialization failed (" SLAPI_COMPONENT_NAME_NSPR " error %d - %s): " - "path: %s, certdb prefix: %s, keydb prefix: %s.", - errorCode, slapd_pr_strerror(errorCode), path, certPref, keyPref); + "certdir: %s", + errorCode, slapd_pr_strerror(errorCode), certdir); rv = -1; } /****** end of NSS Initialization ******/ + slapi_ch_free_string(&certdir); return rv; } From fedora-directory-commits at redhat.com Mon Jan 29 18:48:13 2007 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 29 Jan 2007 13:48:13 -0500 Subject: [Fedora-directory-commits] ldapserver/wrappers ds_newinst.in, 1.2, 1.3 Message-ID: <200701291848.l0TImDbb014066@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/wrappers In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14015/wrappers Modified Files: ds_newinst.in Log Message: Resolves: 223861 Summary: Nightly build uses autotools/yum (Comment #11) Adding @libdir@ at the end of LIB_DIR and @bindir@:@bindir@:/usr/bin:/bin at the end of BIN_DIR in wrappers/ds_newinst.in. These additions are needed when invoking the utility using sudo. Index: ds_newinst.in =================================================================== RCS file: /cvs/dirsec/ldapserver/wrappers/ds_newinst.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ds_newinst.in 2 Nov 2006 03:11:40 -0000 1.2 +++ ds_newinst.in 29 Jan 2007 18:48:11 -0000 1.3 @@ -4,8 +4,8 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@serverdir@ -BIN_DIR=@serverdir@ +LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@serverdir@:@libdir@ +BIN_DIR=@serverdir@:@bindir@:/usr/bin:/bin COMMAND=ds_newinst-bin From fedora-directory-commits at redhat.com Mon Jan 29 23:44:51 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 29 Jan 2007 18:44:51 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd ssl.c, 1.12, 1.13 Message-ID: <200701292344.l0TNippl005750@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5728/ldapserver/ldap/servers/slapd Modified Files: ssl.c Log Message: Resolves: bug 147886 Description: Warn if cert or key file is missing Fix Description: My fix for https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=224672 reopened this bug. I think the correct way to address this problem is this: If using security, the key and cert db files must exist i.e. there must already be a server cert for the server. If not using security, there may not be a key/cert db, but NSS will create them if the directory is writable. Reviewed by: nhosoi (Thanks!) Index: ssl.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ssl.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ssl.c 29 Jan 2007 16:46:25 -0000 1.12 +++ ssl.c 29 Jan 2007 23:44:49 -0000 1.13 @@ -359,62 +359,28 @@ } static void -warn_if_no_cert_file(const char *filename) +warn_if_no_cert_file(const char *dir) { + char *filename = slapi_ch_smprintf("%s/cert8.db", dir); PRStatus status = PR_Access(filename, PR_ACCESS_READ_OK); if (PR_SUCCESS != status) { - /* if file ends in -cert7.db and the corresponding -cert8.db exists, just - warn */ - char *cert8 = slapi_ch_strdup(filename); - char *ptr; - if ((ptr = PL_strrstr(cert8, "-cert7.db"))) { - strcpy(ptr, "-cert8.db"); - status = PR_Access(cert8, PR_ACCESS_READ_OK); - if (PR_SUCCESS == status) { - slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization", - "Notice: certificate DB file %s does not exist but %s does - suggest updating nscertfile\n", - filename, cert8); - } - } - slapi_ch_free_string(&cert8); - - if (PR_SUCCESS != status) { - slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization", - "Warning: certificate DB file %s does not exist - SSL initialization will likely fail\n", - filename); - } + slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization", + "Warning: certificate DB file %s does not exist - SSL initialization will likely fail\n", + filename); } + slapi_ch_free_string(&filename); } static void -warn_if_no_key_file(const char *path, const char *name) +warn_if_no_key_file(const char *dir) { - char last = path[strlen(path)-1]; - char *filename = slapi_ch_smprintf("%s%s%s", path, ((last == '/' || last == '\\') ? "" : "/"), name); + char *filename = slapi_ch_smprintf("%s/key3.db", dir); PRStatus status = PR_Access(filename, PR_ACCESS_READ_OK); if (PR_SUCCESS != status) { - /* if file ends in -key3.db and the corresponding -key4.db exists, just - warn */ - char *key4 = slapi_ch_strdup(filename); - char *ptr; - if ((ptr = PL_strrstr(key4, "-key3.db"))) { - strcpy(ptr, "-key4.db"); - status = PR_Access(key4, PR_ACCESS_READ_OK); - if (PR_SUCCESS == status) { - slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization", - "Notice: key DB file %s does not exist but %s does - suggest updating nskeyfile\n", - filename, key4); - } - } - slapi_ch_free_string(&key4); - - if (PR_SUCCESS != status) { - slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization", - "Warning: key DB file %s does not exist - SSL initialization will likely fail\n", - filename); - } + slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization", + "Warning: key DB file %s does not exist - SSL initialization will likely fail\n", + filename); } - slapi_ch_free_string(&filename); } @@ -450,20 +416,26 @@ certdir[len-1] = '\0'; } - /* we open the key/cert db in rw mode, so make sure the directory - is writable */ - if (PR_SUCCESS != (status = PR_Access(certdir, PR_ACCESS_WRITE_OK))) { - char *serveruser = "unknown"; + /* If the server is configured to use SSL, we must have a key and cert db */ + if (config_get_security()) { + warn_if_no_cert_file(certdir); + warn_if_no_key_file(certdir); + } else { /* otherwise, NSS will create empty databases */ + /* we open the key/cert db in rw mode, so make sure the directory + is writable */ + if (PR_SUCCESS != (status = PR_Access(certdir, PR_ACCESS_WRITE_OK))) { + char *serveruser = "unknown"; #ifndef _WIN32 - serveruser = config_get_localuser(); + serveruser = config_get_localuser(); #endif - slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization", - "Warning: The key/cert database directory [%s] is not writable by " - "the server uid [%s]: initialization likely to fail.\n", - certdir, serveruser); + slapi_log_error(SLAPI_LOG_FATAL, "SSL Initialization", + "Warning: The key/cert database directory [%s] is not writable by " + "the server uid [%s]: initialization likely to fail.\n", + certdir, serveruser); #ifndef _WIN32 - slapi_ch_free_string(&serveruser); + slapi_ch_free_string(&serveruser); #endif + } } /******** Initialise NSS *********/ From fedora-directory-commits at redhat.com Tue Jan 30 00:08:04 2007 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 29 Jan 2007 19:08:04 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/lib dsalib_updown.c, 1.9, 1.10 Message-ID: <200701300008.l0U084mZ009488@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9469 Modified Files: dsalib_updown.c Log Message: Resolves: bug 224606 Description: Instance specific dirs should be in instance directory Fix Description: Needed to reverse rundir and ds_get_server_name() when constructing the pidfile name. Reviewed by: nhosoi (Thanks!) Index: dsalib_updown.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_updown.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dsalib_updown.c 26 Jan 2007 20:00:40 -0000 1.9 +++ dsalib_updown.c 30 Jan 2007 00:08:01 -0000 1.10 @@ -95,7 +95,7 @@ fprintf(stderr, "ds_get_updown_status: could not get install root\n"); return(DS_SERVER_UNKNOWN); } - PR_snprintf(pid_file_name, BIG_LINE, "%s/%s.pid", ds_get_server_name(), rundir); + PR_snprintf(pid_file_name, BIG_LINE, "%s/%s.pid", rundir, ds_get_server_name()); pidfile = fopen(pid_file_name, "r"); if ( pidfile == NULL ) { /* From fedora-directory-commits at redhat.com Wed Jan 31 22:27:44 2007 From: fedora-directory-commits at redhat.com (Pete Rowley (prowley)) Date: Wed, 31 Jan 2007 17:27:44 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/dna - New directory Message-ID: <200701312227.l0VMRiRj024143@cvs-int.fedora.redhat.com> Author: prowley Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/dna In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24129/dna Log Message: Directory /cvs/dirsec/ldapserver/ldap/servers/plugins/dna added to the repository From fedora-directory-commits at redhat.com Wed Jan 31 22:36:12 2007 From: fedora-directory-commits at redhat.com (Pete Rowley (prowley)) Date: Wed, 31 Jan 2007 17:36:12 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/vattrsp_template vattrsp.c, 1.5, 1.6 Message-ID: <200701312236.l0VMaCRW024230@cvs-int.fedora.redhat.com> Author: prowley Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/vattrsp_template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24203/ldap/servers/plugins/vattrsp_template Modified Files: vattrsp.c Log Message: minor edits to remove references to cos in the example Index: vattrsp.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/vattrsp_template/vattrsp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vattrsp.c 10 Nov 2006 23:45:32 -0000 1.5 +++ vattrsp.c 31 Jan 2007 22:36:10 -0000 1.6 @@ -95,8 +95,8 @@ ); -static Slapi_PluginDesc pdesc = { "vattrsp", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, - "class of service plugin" }; +static Slapi_PluginDesc pdesc = { "vattrexamplesp", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, + "vattr service provider example plugin" }; static void * vattrsp_plugin_identity = NULL; From fedora-directory-commits at redhat.com Wed Jan 31 22:49:27 2007 From: fedora-directory-commits at redhat.com (Pete Rowley (prowley)) Date: Wed, 31 Jan 2007 17:49:27 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins Makefile, 1.11, 1.12 Message-ID: <200701312249.l0VMnR6C024352@cvs-int.fedora.redhat.com> Author: prowley Update of /cvs/dirsec/ldapserver/ldap/servers/plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24292/ldap/servers/plugins Modified Files: Makefile Log Message: Distributed numeric assignment plugin - initial check in Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile 10 Nov 2006 01:28:20 -0000 1.11 +++ Makefile 31 Jan 2007 22:49:19 -0000 1.12 @@ -50,7 +50,7 @@ include $(BUILD_ROOT)/nsconfig.mk include $(LDAP_SRC)/nsldap.mk -PLUGINS = _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _views +PLUGINS = _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _views _dna ifneq ($(ARCH), WINNT) ifneq ($(BRAND), redhat) PLUGINS += _pam_passthru @@ -121,6 +121,9 @@ _views: cd views; $(MAKE) $(MFLAGS) all +_dna: + cd dna; $(MAKE) $(MFLAGS) all + clean: cd rever; $(MAKE) $(MFLAGS) clean cd referint; $(MAKE) $(MFLAGS) clean @@ -144,5 +147,6 @@ cd http; $(MAKE) $(MFLAGS) clean cd views; $(MAKE) $(MFLAGS) clean #cd presence; $(MAKE) $(MFLAGS) clean + cd dna; $(MAKE) $(MFLAGS) clean veryclean: clean From fedora-directory-commits at redhat.com Wed Jan 31 22:49:27 2007 From: fedora-directory-commits at redhat.com (Pete Rowley (prowley)) Date: Wed, 31 Jan 2007 17:49:27 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/dna Makefile, NONE, 1.1 addentries.sh, NONE, 1.1 config.sh, NONE, 1.1 del_test_entries.dns, NONE, 1.1 delentries.sh, NONE, 1.1 dna.c, NONE, 1.1 dna.ldif, NONE, 1.1 editentries.sh, NONE, 1.1 oneentry.sh, NONE, 1.1 posix.ldif, NONE, 1.1 posix_one.ldif, NONE, 1.1 posix_test.ldif, NONE, 1.1 seeconfig.sh, NONE, 1.1 seeentries.sh, NONE, 1.1 subtest.ldif, NONE, 1.1 Message-ID: <200701312249.l0VMnRae024357@cvs-int.fedora.redhat.com> Author: prowley Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/dna In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24292/ldap/servers/plugins/dna Added Files: Makefile addentries.sh config.sh del_test_entries.dns delentries.sh dna.c dna.ldif editentries.sh oneentry.sh posix.ldif posix_one.ldif posix_test.ldif seeconfig.sh seeentries.sh subtest.ldif Log Message: Distributed numeric assignment plugin - initial check in --- NEW FILE Makefile --- # # BEGIN COPYRIGHT BLOCK # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # LDAP_SRC = ../../.. BUILD_ROOT = ../../../.. NOSTDCLEAN=true # don't let nsconfig.mk define target clean NOSTDSTRIP=true # don't let nsconfig.mk define target strip OBJDEST = $(OBJDIR)/lib/libdna LIBDIR = $(LDAP_PLUGIN_RELDIR) include $(BUILD_ROOT)/nsdefs.mk include $(BUILD_ROOT)/nsconfig.mk include $(LDAP_SRC)/nsldap.mk ifeq ($(ARCH), WINNT) DEF_FILE:=./dna.def endif DNA_OBJS = dna.o OBJS = $(addprefix $(OBJDEST)/, $(DNA_OBJS)) DNA_DLL = libdna-plugin INCLUDES += -I../http -I../../slapd -I../../../include CFLAGS+=$(SLCFLAGS) -DSLAPD_LOGGING ifeq ($(ARCH), WINNT) EXTRA_LIBS_DEP += $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP) EXTRA_LIBS_DEP += $(LDAP_COMMON_LIBS_DEP) EXTRA_LIBS += $(NSPRLINK) $(LIBSLAPD) $(LDAP_SDK_LIBLDAP_DLL) EXTRA_LIBS += $(LDAP_COMMON_LIBS) DNA_DLL_OBJ = $(addprefix $(OBJDEST)/, dllmain.o) endif ifeq ($(ARCH), AIX) EXTRA_LIBS_DEP += $(LIBSLAPD) $(NSPR_DEP) $(LDAPSDK_DEP) EXTRA_LIBS_DEP += $(LDAP_COMMON_LIBS_DEP) EXTRA_LIBS += $(LIBSLAPDLINK) $(NSPRLINK) $(LDAP_SDK_LIBLDAP_DLL) EXTRA_LIBS += $(LDAP_COMMON_LIBS) LD=ld endif ifeq ($(ARCH), HPUX) EXTRA_LIBS_DEP += $(LIBSLAPD_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(SECURITY_DEP) EXTRA_LIBS_DEP += $(LDAP_COMMON_LIBS_DEP) EXTRA_LIBS += $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) $(ICULINK) EXTRA_LIBS += $(LDAP_COMMON_LIBS) endif DNA= $(addprefix $(LIBDIR)/, $(DNA_DLL).$(DLL_SUFFIX)) clientSDK: all: $(OBJDEST) $(LIBDIR) $(DNA) ifeq ($(ARCH), WINNT) $(DNA): $(OBJS) $(DNA_DLL_OBJ) $(DEF_FILE) $(LINK_DLL) $(DNA_DLL_OBJ) $(EXTRA_LIBS) /DEF:$(DEF_FILE) else $(DNA): $(OBJS) $(DNA_DLL_OBJ) $(LINK_DLL) $(DNA_DLL_OBJ) $(EXTRA_LIBS) endif veryclean: clean clean: $(RM) $(OBJS) ifeq ($(ARCH), WINNT) $(RM) $(DNA_DLL_OBJ) endif $(RM) $(DNA) $(OBJDEST): $(MKDIR) $(OBJDEST) $(LIBDIR): $(MKDIR) $(LIBDIR) --- NEW FILE addentries.sh --- #!/bin/sh ldapadd -x -D "cn=Directory Manager" -w secret123 -h localhost -p 3389 -f posix_test.ldif -c --- NEW FILE config.sh --- #!/bin/sh ldapadd -x -D "cn=Directory Manager" -w secret123 -h localhost -p 3389 -f dna.ldif -c ldapadd -x -D "cn=Directory Manager" -w secret123 -h localhost -p 3389 -f posix.ldif -c ldapadd -x -D "cn=Directory Manager" -w secret123 -h localhost -p 3389 -f subtest.ldif -c --- NEW FILE del_test_entries.dns --- uid=add_has_magic_number, dc=example, dc=com uid=add_second_has_magic_number, dc=example, dc=com uid=no_uid_number, dc=example, dc=com uid=add_has_uid_number_550, dc=example, dc=com uid=add_is_sub, ou=sub, dc=example, dc=com ou=sub, dc=example, dc=com --- NEW FILE delentries.sh --- #!/bin/sh ldapdelete -x -D "cn=Directory Manager" -w secret123 -h localhost -p 3389 -f del_test_entries.dns -c --- NEW FILE dna.c --- /** BEGIN COPYRIGHT BLOCK * This Program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software * Foundation; version 2 of the License. * * This Program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along with * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA. * * In addition, as a special exception, Red Hat, Inc. gives You the additional * right to link the code of this Program with code not covered under the GNU * General Public License ("Non-GPL Code") and to distribute linked combinations * including the two, subject to the limitations in this paragraph. Non-GPL Code * permitted under this exception must only link to the code of this Program * through those well defined interfaces identified in the file named EXCEPTION * found in the source code files (the "Approved Interfaces"). The files of * Non-GPL Code may instantiate templates or use macros or inline functions from * the Approved Interfaces without causing the resulting work to be covered by * the GNU General Public License. Only Red Hat, Inc. may make changes or * additions to the list of Approved Interfaces. You must obey the GNU General * Public License in all respects for all of the Program code and other code used * in conjunction with the Program except the Non-GPL Code covered by this * exception. If you modify this file, you may extend this exception to your * version of the file, but you are not obligated to do so. If you do not wish to * provide this exception without modification, you must delete this exception * statement from your version and license this file solely under the GPL without * exception. * * * Copyright (C) 2007 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ #ifdef HAVE_CONFIG_H # include #endif /** * Distributed Numeric Assignment plug-in */ #include #include #include #include "portable.h" #include "nspr.h" #include "slapi-private.h" #include "dirlite_strings.h" #include "dirver.h" #include "prclist.h" #include "ldif.h" /* get file mode flags for unix */ #ifndef _WIN32 #include #endif #define DNA_PLUGIN_SUBSYSTEM "dna-plugin" #define DNA_PLUGIN_VERSION 0x00010000 #define DNA_DN "cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config" /* temporary */ #define DNA_SUCCESS 0 #define DNA_FAILURE -1 /** * DNA config types */ #define DNA_TYPE "dnaType" #define DNA_PREFIX "dnaPrefix" #define DNA_NEXTVAL "dnaNextValue" #define DNA_INTERVAL "dnaInterval" #define DNA_GENERATE "dnaMagicRegen" #define DNA_FILTER "dnaFilter" #define DNA_SCOPE "dnaScope" #define FEATURE_DESC "Distributed Numeric Assignment" #define PLUGIN_DESC "Distributed Numeric Assignment plugin" static Slapi_PluginDesc pdesc = { FEATURE_DESC, PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, PLUGIN_DESC }; /** * linked list of config entries */ struct _defs { PRCList list; char *dn; char *type; char *prefix; unsigned long nextval; unsigned long interval; struct slapi_filter *filter; char *generate; char *scope; } dna_anchor; typedef struct _defs configEntry; static PRCList *config; static PRRWLock *g_dna_cache_lock; static void *_PluginID = NULL; static char *_PluginDN = NULL; /* * new value lock */ static Slapi_Mutex *g_new_value_lock; /** * * DNA plug-in management functions * */ int dna_init(Slapi_PBlock *pb); static int dna_start(Slapi_PBlock *pb); static int dna_close(Slapi_PBlock *pb); static int dna_postop_init(Slapi_PBlock *pb); /** * * Local operation functions * */ static int loadPluginConfig(); static int parseConfigEntry(Slapi_Entry *e); static void deleteConfig(); static void freeConfigEntry(configEntry **entry); /** * * helpers * */ static char *dna_get_dn(Slapi_PBlock *pb); static int dna_dn_is_config(char *dn); static int dna_get_next_value(configEntry *config_entry, char **next_value_ret); /** * * the ops (where the real work is done) * */ static int dna_config_check_post_op(Slapi_PBlock *pb); static int dna_pre_op( Slapi_PBlock *pb, int modtype ); static int dna_mod_pre_op( Slapi_PBlock *pb ); static int dna_add_pre_op( Slapi_PBlock *pb ); /** * debug functions - global, for the debugger */ void dnaDumpConfig(); void dnaDumpConfigEntry(configEntry *); /** * set the debug level */ #ifdef _WIN32 int *module_ldap_debug = 0; void plugin_init_debug_level(int *level_ptr) { module_ldap_debug = level_ptr; } #endif /** * * Deal with cache locking * */ void dna_read_lock() { PR_RWLock_Rlock(g_dna_cache_lock); } void dna_write_lock() { PR_RWLock_Wlock(g_dna_cache_lock); } void dna_unlock() { PR_RWLock_Unlock(g_dna_cache_lock); } /** * * Get the dna plug-in version * */ int dna_version() { return DNA_PLUGIN_VERSION; } /** * Plugin identity mgmt */ void setPluginID(void * pluginID) { _PluginID=pluginID; } void * getPluginID() { return _PluginID; } void setPluginDN(char *pluginDN) { _PluginDN = pluginDN; } char * getPluginDN() { return _PluginDN; } /* dna_init ------------- adds our callbacks to the list */ int dna_init( Slapi_PBlock *pb ) { int status = DNA_SUCCESS; char * plugin_identity=NULL; slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_init\n"); /** * Store the plugin identity for later use. * Used for internal operations */ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &plugin_identity); PR_ASSERT (plugin_identity); setPluginID(plugin_identity); if ( slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, SLAPI_PLUGIN_VERSION_01 ) != 0 || slapi_pblock_set(pb, SLAPI_PLUGIN_START_FN, (void *) dna_start ) != 0 || slapi_pblock_set(pb, SLAPI_PLUGIN_CLOSE_FN, (void *) dna_close ) != 0 || slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, (void *)&pdesc ) != 0 || slapi_pblock_set(pb, SLAPI_PLUGIN_PRE_MODIFY_FN, (void *) dna_mod_pre_op ) != 0 || slapi_pblock_set(pb, SLAPI_PLUGIN_PRE_ADD_FN, (void *) dna_add_pre_op ) != 0 || /* the config change checking post op */ slapi_register_plugin( "postoperation", /* op type */ 1, /* Enabled */ "dna_init", /* this function desc */ dna_postop_init, /* init func for post op */ PLUGIN_DESC, /* plugin desc */ NULL, /* ? */ plugin_identity /* access control */ ) ) { slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, "dna_init: failed to register plugin\n" ); status = DNA_FAILURE; } slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_init\n"); return status; } static int dna_postop_init(Slapi_PBlock *pb) { int status = DNA_SUCCESS; if ( slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, SLAPI_PLUGIN_VERSION_01 ) != 0 || slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, (void *)&pdesc ) != 0 || slapi_pblock_set(pb, SLAPI_PLUGIN_POST_ADD_FN, (void *) dna_config_check_post_op ) != 0 || slapi_pblock_set(pb, SLAPI_PLUGIN_POST_MODRDN_FN, (void *) dna_config_check_post_op ) != 0 || slapi_pblock_set(pb, SLAPI_PLUGIN_POST_DELETE_FN, (void *) dna_config_check_post_op ) != 0 || slapi_pblock_set(pb, SLAPI_PLUGIN_POST_MODIFY_FN, (void *) dna_config_check_post_op ) != 0 ) { slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, "dna_postop_init: failed to register plugin\n" ); status = DNA_FAILURE; } return status; } /* dna_start -------------- Kicks off the config cache. It is called after dna_init. */ static int dna_start( Slapi_PBlock *pb ) { char * plugindn = NULL; char * httpRootDir = NULL; slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_start\n"); config = &dna_anchor.list; g_dna_cache_lock = PR_NewRWLock(PR_RWLOCK_RANK_NONE, "dna"); g_new_value_lock = slapi_new_mutex(); if(!g_dna_cache_lock || !g_new_value_lock) { slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, "dna_start: lock creation failed\n" ); return DNA_FAILURE; } /** * Get the plug-in target dn from the system * and store it for future use. This should avoid * hardcoding of DN's in the code. */ slapi_pblock_get(pb, SLAPI_TARGET_DN, &plugindn); if (plugindn == NULL || strlen(plugindn) == 0) { slapi_log_error( SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM , "dna_start: had to use hard coded config dn\n"); plugindn = DNA_DN; } else { slapi_log_error( SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM , "dna_start: config at %s\n", plugindn); } setPluginDN(plugindn); /** * Load the config for our plug-in */ PR_INIT_CLIST(config); if (loadPluginConfig() != DNA_SUCCESS) { slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, "dna_start: unable to load plug-in configuration\n" ); return DNA_FAILURE; } slapi_log_error( SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM , "dna: ready for service\n"); slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_start\n"); return DNA_SUCCESS; } /* dna_close -------------- closes down the cache */ static int dna_close( Slapi_PBlock *pb ) { slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_close\n"); deleteConfig(); slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_close\n"); return DNA_SUCCESS; } /* * config looks like this * - cn=myplugin * --- ou=posix * ------ cn=accounts * ------ cn=groups * --- cn=samba * --- cn=etc * ------ cn=etc etc */ static int loadPluginConfig() { int status = DNA_SUCCESS; int result; int i; Slapi_PBlock *search_pb; Slapi_Entry **entries = NULL; slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> loadPluginConfig\n"); dna_write_lock(); deleteConfig(); search_pb = slapi_pblock_new(); slapi_search_internal_set_pb(search_pb, DNA_DN, LDAP_SCOPE_SUBTREE, "objectclass=*", NULL, 0, NULL, NULL, getPluginID(), 0); slapi_search_internal_pb(search_pb); slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &result); if (status != DNA_SUCCESS) { status = DNA_SUCCESS; goto cleanup; } slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries); if (NULL == entries || entries[0] == NULL) { status = DNA_SUCCESS; goto cleanup; } for (i = 0; (entries[i] != NULL); i++) { status = parseConfigEntry(entries[i]); } cleanup: slapi_free_search_results_internal(search_pb); slapi_pblock_destroy(search_pb); dna_unlock(); slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- loadPluginConfig\n"); return status; } static int parseConfigEntry(Slapi_Entry *e) { char *key = NULL; char *value = NULL; configEntry *entry = NULL; configEntry *config_entry = NULL; Slapi_Attr *attr = NULL; PRCList *list = NULL; int entry_added = 0; slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> parseConfigEntry\n"); entry = (configEntry*) slapi_ch_calloc(1, sizeof(configEntry)); if(0 == entry) goto bail; value = slapi_entry_get_ndn(e); if(value) { entry->dn = strdup(value); } slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dn [%s] \n",entry->dn,0,0); value = slapi_entry_attr_get_charptr(e, DNA_TYPE); if(value) { entry->type = value; } else goto bail; slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaType [%s] \n",entry->type,0,0); value = slapi_entry_attr_get_charptr(e, DNA_NEXTVAL); if (value) { entry->nextval = strtoul(value,0,0); slapi_ch_free_string(&value); value = 0; } else goto bail; slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaNextValue [%d] \n",entry->nextval,0,0); value = slapi_entry_attr_get_charptr(e, DNA_PREFIX); if (value) { entry->prefix = value; } slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaPrefix [%s] \n",entry->prefix,0,0); value = slapi_entry_attr_get_charptr(e, DNA_INTERVAL); if (value) { entry->interval = strtoul(value,0,0); slapi_ch_free_string(&value); value = 0; } else goto bail; slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaInterval [%s] \n",value,0,0); value = slapi_entry_attr_get_charptr(e, DNA_GENERATE); if (value) { entry->generate = value; } slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaMagicRegen [%s] \n",entry->generate,0,0); value = slapi_entry_attr_get_charptr(e, DNA_FILTER); if (value) { entry->filter = slapi_str2filter(value); } else goto bail; slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaFilter [%s] \n",value,0,0); slapi_ch_free_string(&value); value = 0; value = slapi_entry_attr_get_charptr(e, DNA_SCOPE); if (value) { char *canonical_dn = slapi_dn_normalize(value); entry->scope = canonical_dn; } slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaScope [%s] \n",entry->scope,0,0); /** * Finally add the entry to the list * we group by type then by filter * and finally sort by dn length with longer dn's * first - this allows the scope checking * code to be simple and quick and * cunningly linear */ if(!PR_CLIST_IS_EMPTY(config)) { list = PR_LIST_HEAD(config); while(list != config) { config_entry = (configEntry*)list; if(slapi_attr_type_cmp(config_entry->type, entry->type,1)) goto next; if(slapi_filter_compare(config_entry->filter, entry->filter)) goto next; if(slapi_dn_issuffix(entry->scope,config_entry->scope)) { PR_INSERT_BEFORE(&(entry->list), list); slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "store [%s] before [%s] \n",entry->scope,config_entry->scope,0); entry_added = 1; break; } next: list = PR_NEXT_LINK (list); if(config == list) { /* add to tail */ PR_INSERT_BEFORE(&(entry->list), list); slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "store [%s] at tail\n",entry->scope,0,0); entry_added = 1; break; } } } else { /* first entry */ PR_INSERT_LINK(&(entry->list), config); slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "store [%s] at head \n",entry->scope,0,0); entry_added = 1; } bail: if(0 == entry_added) { slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "config entry [%s] skipped\n",entry->dn,0,0); freeConfigEntry(&entry); } slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- parseConfigEntry\n"); return DNA_SUCCESS; } static void freeConfigEntry(configEntry **entry) { configEntry *e = *entry; if(e->dn) { slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "freeing config entry [%s]\n",e->dn,0,0); slapi_ch_free_string(&e->dn); } if(e->type) slapi_ch_free_string(&e->type); if(e->prefix) slapi_ch_free_string(&e->prefix); if(e->filter) slapi_filter_free(e->filter,1); if(e->generate) slapi_ch_free_string(&e->generate); if(e->scope) slapi_ch_free_string(&e->scope); slapi_ch_free((void**)entry); } static void deleteConfigEntry(PRCList *entry) { PR_REMOVE_LINK(entry); freeConfigEntry((configEntry**)&entry); } static void deleteConfig() { PRCList *list; while(!PR_CLIST_IS_EMPTY(config)) { list = PR_LIST_HEAD(config); deleteConfigEntry(list); } return; } /**************************************************** Helpers ****************************************************/ static char *dna_get_dn(Slapi_PBlock *pb) { char *dn = 0; slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_get_dn\n"); if(slapi_pblock_get( pb, SLAPI_TARGET_DN, &dn )) { slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, "dna_get_dn: failed to get dn of changed entry"); goto bail; } /* slapi_dn_normalize( dn ); */ bail: slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_get_dn\n"); return dn; } /* config check matching config dn or a descendent reloads config */ static int dna_dn_is_config(char *dn) { int ret = 0; slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_is_config\n"); if(slapi_dn_issuffix(dn, getPluginDN())) { ret=1; } slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_is_config\n"); return ret; } /**************************************************** Functions that actually do things other than config and startup ****************************************************/ /* * Perform ldap operationally atomic increment * Return the next value to be assigned * Method: * 1. retrieve entry * 2. remove current value, add new value in one operation * 3. if failed, and less than 3 times, goto 1 */ static int dna_get_next_value(configEntry *config_entry, char **next_value_ret) { int ret = LDAP_SUCCESS; Slapi_DN *dn = 0; char *attrlist[3]; Slapi_Entry *e = 0; int attempts = 0; slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_get_next_value\n"); /* get pre-requisites to search */ dn = slapi_sdn_new_dn_byref(config_entry->dn); attrlist[0] = DNA_NEXTVAL; attrlist[1] = DNA_INTERVAL; attrlist[2] = 0; /* the operation is constructed such that race conditions * to increment the value are detected and avoided - one wins, * one loses - however, there is no need for the server to compete * with itself so we lock here */ slapi_lock_mutex(g_new_value_lock); while(attempts < 3 && LDAP_SUCCESS == ret) { attempts++; /* do update */ if(e) { slapi_entry_free(e); e = 0; } ret = slapi_search_internal_get_entry( dn, attrlist, &e,getPluginID()); if(LDAP_SUCCESS == ret) { char *old_value; old_value = slapi_entry_attr_get_charptr(e, DNA_NEXTVAL); if(old_value) { LDAPMod mod_add; LDAPMod mod_delete; LDAPMod *mods[3]; Slapi_PBlock *pb = slapi_pblock_new(); char *delete_val[2]; char *add_val[2]; char new_value[16]; char *interval = 0; mods[0] = &mod_delete; mods[1] = &mod_add; mods[2] = 0; if(0 == pb) goto bail; interval = slapi_entry_attr_get_charptr(e, DNA_INTERVAL); if(0 == interval) { slapi_pblock_destroy(pb); slapi_ch_free_string(&old_value); goto bail; } /* perform increment */ sprintf(new_value, "%lu", strtoul(interval,0,0) + strtoul(old_value,0,0)); delete_val[0] = old_value; delete_val[1] = 0; mod_delete.mod_op = LDAP_MOD_DELETE; mod_delete.mod_type = DNA_NEXTVAL; mod_delete.mod_values = delete_val; add_val[0] = new_value; add_val[1] = 0; mod_add.mod_op = LDAP_MOD_ADD; mod_add.mod_type = DNA_NEXTVAL; mod_add.mod_values = add_val; mods[0] = &mod_delete; mods[1] = &mod_add; mods[2] = 0; slapi_modify_internal_set_pb( pb, config_entry->dn, mods, 0, 0, getPluginID(), 0); slapi_modify_internal_pb(pb); slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &ret); slapi_pblock_destroy(pb); slapi_ch_free_string(&interval); if(LDAP_SUCCESS == ret) { *next_value_ret = old_value; break; } else { slapi_ch_free_string(&old_value); if(LDAP_NO_SUCH_ATTRIBUTE != ret) { /* not the result of a race to change the value */ break; } else /* we lost the race to mod try again */ ret = LDAP_SUCCESS; } } else break; } else break; } bail: slapi_unlock_mutex(g_new_value_lock); if(dn) slapi_sdn_free(&dn); if(e) slapi_entry_free(e); slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_get_next_value\n"); return ret; } /* for mods and adds: where dn's are supplied, the closest in scope is used as long as the type and filter are identical - otherwise all matches count */ static int dna_pre_op(Slapi_PBlock *pb, int modtype) { char *dn = 0; PRCList *list = 0; configEntry *config_entry = 0; struct slapi_entry *e = 0; char *last_type = 0; char *value = 0; int generate = 0; Slapi_Mods *smods = 0; Slapi_Mod *smod = 0; LDAPMod **mods; int free_entry = 0; int ret = 0; slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_pre_op\n"); if(0 == (dn = dna_get_dn(pb))) goto bail; if(dna_dn_is_config(dn)) goto bail; if(LDAP_CHANGETYPE_ADD == modtype) { slapi_pblock_get( pb, SLAPI_ADD_ENTRY, &e); } else { /* xxxPAR: Ideally SLAPI_MODIFY_EXISTING_ENTRY should be * available but it turns out that is only true if you are * a dbm backend pre-op plugin - lucky dbm backend pre-op * plugins. * I think that is wrong since the entry is useful for filter * tests and schema checks and this plugin shouldn't be limited * to a single backend type, but I don't want that fight right * now so we go get the entry here * slapi_pblock_get( pb, SLAPI_MODIFY_EXISTING_ENTRY, &e); */ Slapi_DN *tmp_dn = slapi_sdn_new_dn_byref(dn); if(tmp_dn) { slapi_search_internal_get_entry( tmp_dn, 0, &e,getPluginID()); slapi_sdn_free(&tmp_dn); free_entry = 1; } /* grab the mods - we'll put them back later with * our modifications appended */ slapi_pblock_get( pb, SLAPI_MODIFY_MODS, &mods); smods = slapi_mods_new(); slapi_mods_init_passin(smods, mods); } if(0 == e) goto bailmod; dna_read_lock(); if(!PR_CLIST_IS_EMPTY(config)) { list = PR_LIST_HEAD(config); while(list != config && LDAP_SUCCESS == ret) { config_entry = (configEntry*)list; /* did we already service this type? */ if(last_type) { if(!slapi_attr_type_cmp(config_entry->type, last_type,1)) goto next; } /* is the entry in scope? */ if(config_entry->scope) { if(!slapi_dn_issuffix(dn, config_entry->scope)) goto next; } /* does the entry match the filter? */ if(config_entry->filter) { if(LDAP_SUCCESS != slapi_vattr_filter_test(pb, e, config_entry->filter,0)) goto next; } if(LDAP_CHANGETYPE_ADD == modtype) { /* does attribute contain the magic value or is the type not there? */ value = slapi_entry_attr_get_charptr( e, config_entry->type); if((value && !slapi_utf8casecmp( config_entry->generate, value)) || 0 == value) { generate = 1; } } else { /* check mods for magic value */ Slapi_Mod *next_mod = slapi_mod_new(); smod = slapi_mods_get_first_smod( smods, next_mod); while(smod) { char *type = (char *) slapi_mod_get_type(smod); if(slapi_attr_types_equivalent( type, config_entry->type)) { struct berval *bv = slapi_mod_get_first_value( smod); int len = strlen( config_entry-> generate); if(len == bv->bv_len) { if(!slapi_utf8ncasecmp( bv->bv_val, config_entry-> generate, len)) generate = 1; break; } } slapi_mod_done(next_mod); smod = slapi_mods_get_next_smod( smods, next_mod); } slapi_mod_free(&next_mod); } if(generate) { char *new_value; int len; /* create the value to add */ if(ret = dna_get_next_value(config_entry,&value)) break; len = strlen(value) + 1; if(config_entry->prefix) { len += strlen(config_entry->prefix); } new_value = slapi_ch_malloc(len); if(config_entry->prefix) { strcpy(new_value, config_entry->prefix); strcat(new_value, value); } else strcpy(new_value, value); /* do the mod */ if(LDAP_CHANGETYPE_ADD == modtype) { /* add - add to entry */ slapi_entry_attr_set_charptr( e, config_entry->type, new_value); } else { /* mod - add to mods */ slapi_mods_add_string( smods, LDAP_MOD_REPLACE, config_entry->type, new_value); } /* free up */ slapi_ch_free_string(&value); slapi_ch_free_string(&new_value); /* make sure we don't generate for this * type again */ if(LDAP_SUCCESS == ret) { last_type = config_entry->type; } generate = 0; } next: list = PR_NEXT_LINK (list); } } dna_unlock(); bailmod: if(LDAP_CHANGETYPE_MODIFY == modtype) { /* these are the mods you made, really, * I didn't change them, honest, just had a quick look */ mods = slapi_mods_get_ldapmods_passout(smods); slapi_pblock_set( pb, SLAPI_MODIFY_MODS, mods); slapi_mods_free(&smods); } bail: if(free_entry && e) slapi_entry_free(e); if(ret) slapi_log_error( SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM , "dna_pre_op: operation failure [%d]\n", ret); slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_pre_op\n"); return ret; } static int dna_add_pre_op( Slapi_PBlock *pb ) { return dna_pre_op(pb, LDAP_CHANGETYPE_ADD); } static int dna_mod_pre_op( Slapi_PBlock *pb ) { return dna_pre_op(pb, LDAP_CHANGETYPE_MODIFY); } static int dna_config_check_post_op(Slapi_PBlock *pb) { char *dn; slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_config_check_post_op\n"); if(dn = dna_get_dn(pb)) { if(dna_dn_is_config(dn)) loadPluginConfig(); } bail: slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_config_check_post_op\n"); return 0; } /**************************************************** End of Functions that actually do things other than config and startup ****************************************************/ /** * debug functions to print config */ void dnaDumpConfig() { PRCList *list; dna_read_lock(); if(!PR_CLIST_IS_EMPTY(config)) { list = PR_LIST_HEAD(config); while(list != config) { dnaDumpConfigEntry((configEntry*)list); list = PR_NEXT_LINK (list); } } dna_unlock(); } void dnaDumpConfigEntry(configEntry *entry) { printf("<- type --------------> %s\n", entry->type); printf("<---- prefix ---------> %s\n", entry->prefix); printf("<---- next value -----> %lu\n", entry->nextval); printf("<---- interval -------> %lu\n", entry->interval); printf("<---- filter ---------> %s\n", entry->filter); printf("<---- generate flag --> %s\n", entry->generate); } --- NEW FILE dna.ldif --- # --- BEGIN COPYRIGHT BLOCK --- # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # --- END COPYRIGHT BLOCK --- # plugin configuration entry dn: cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config objectclass: top objectclass: nsSlapdPlugin objectclass: extensibleObject objectclass: nsContainer cn: Distributed Numeric Assignment Plugin nsslapd-plugininitfunc: dna_init nsslapd-plugintype: preoperation nsslapd-pluginenabled: on nsslapd-plugindescription: Distributed Numeric Assignment plugin nsslapd-pluginvendor: Fedora Project nsslapd-pluginVersion: 1.1 nsslapd-pluginId: distributed-numeric-assignment nsslapd-pluginPath: /home/prowley/srv/lib/fedora-ds/plugins/libdna-plugin.so --- NEW FILE editentries.sh --- #!/bin/sh ldapvi -D "cn=Directory Manager" -w secret123 -h localhost:3389 -b "dc=example, dc=com" "(objectclass=posixaccount)" --- NEW FILE oneentry.sh --- #!/bin/sh ldapadd -x -D "cn=Directory Manager" -w secret123 -h localhost -p 3389 -f posix_one.ldif -c --- NEW FILE posix.ldif --- # --- BEGIN COPYRIGHT BLOCK --- # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # --- END COPYRIGHT BLOCK --- # add plugin configuration for posix users dn: cn=Posix,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config objectclass: top objectclass: nsContainer objectclass: extensibleObject cn: Posix dn: cn=Accounts,cn=Posix,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config objectclass: top objectclass: extensibleObject cn: Accounts dnaType: uidNumber dnaNextValue: 500 dnaInterval: 4 dnaMagicRegen: 499 dnaFilter: (objectclass=posixAccount) # add plugin configuration for posix groups dn: cn=Groups,cn=Posix,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config objectclass: top objectclass: extensibleObject cn: Groups dnaType: gidNumber dnaNextValue: 500 dnaInterval: 4 dnaMagicRegen: 499 dnaFilter: (objectclass=posixGroup) --- NEW FILE posix_one.ldif --- dn: uid=add_has_magic_number, dc=example, dc=com objectclass: top objectclass: organizationalperson objectclass: posixaccount cn: 1 sn: test uid: add_has_uid_number uidNumber: 499 gidNumber: 550 homeDirectory: / --- NEW FILE posix_test.ldif --- dn: uid=add_has_magic_number, dc=example, dc=com objectclass: top objectclass: organizationalperson objectclass: posixaccount cn: 1 sn: test uid: add_has_uid_number uidNumber: 499 gidNumber: 550 homeDirectory: / dn: uid=add_second_has_magic_number, dc=example, dc=com objectclass: top objectclass: organizationalperson objectclass: posixaccount cn: 2 sn: test uid: add_second_has_magic_number uidNumber: 499 gidNumber: 550 homeDirectory: / dn: uid=no_uid_number, dc=example, dc=com objectclass: top objectclass: organizationalperson objectclass: posixaccount cn: 3 sn: test uid: no_uid_number gidNumber: 550 homeDirectory: / dn: uid=add_has_uid_number_550, dc=example, dc=com objectclass: top objectclass: organizationalperson objectclass: posixaccount cn: 4 sn: test uid: add_has_uid_number uidNumber: 550 gidNumber: 550 homeDirectory: / dn: ou=sub, dc=example, dc=com objectclass: top objectclass: organizationalunit ou: sub dn: uid=add_is_sub, ou=sub, dc=example, dc=com objectclass: top objectclass: organizationalperson objectclass: posixaccount cn: 4 sn: test uidNumber: 499 gidNumber: 550 homeDirectory: / --- NEW FILE seeconfig.sh --- #!/bin/sh ldapsearch -x -D "cn=Directory Manager" -w secret123 -h localhost -p 3389 -b "cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config" "(objectclass=*)" --- NEW FILE seeentries.sh --- #!/bin/sh ldapsearch -x -D "cn=Directory Manager" -w secret123 -h localhost -p 3389 -b "dc=example, dc=com" "(objectclass=posixaccount)" --- NEW FILE subtest.ldif --- # --- BEGIN COPYRIGHT BLOCK --- # This Program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; version 2 of the License. # # This Program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2007 Red Hat, Inc. # All rights reserved. # --- END COPYRIGHT BLOCK --- # add Samba SIDs dn: cn=Example top level,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config objectclass: top objectclass: extensibleObject dnaType: title dnaPrefix: example- dnaNextValue: 600 dnaInterval: 4 dnaMagicRegen: assign dnaFilter: (objectclass=organizationalperson) dnaScope: dc=example, dc=com dn: cn=Example sub level,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config objectclass: top objectclass: extensibleObject dnaType: title dnaPrefix: sub-example- dnaNextValue: 600 dnaInterval: 4 dnaMagicRegen: assign dnaFilter: (objectclass=organizationalperson) dnaScope: ou=sub, dc=example, dc=com From fedora-directory-commits at redhat.com Wed Jan 31 22:49:21 2007 From: fedora-directory-commits at redhat.com (Pete Rowley (prowley)) Date: Wed, 31 Jan 2007 17:49:21 -0500 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.17, 1.18 Makefile.in, 1.18, 1.19 Message-ID: <200701312249.l0VMnpGj024361@cvs-int.fedora.redhat.com> Author: prowley Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24292 Modified Files: Makefile.am Makefile.in Log Message: Distributed numeric assignment plugin - initial check in Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile.am 26 Jan 2007 20:54:32 -0000 1.17 +++ Makefile.am 31 Jan 2007 22:49:19 -0000 1.18 @@ -78,7 +78,7 @@ libpassthru-plugin.la libpresence-plugin.la libpwdstorage-plugin.la \ libreferint-plugin.la libreplication-plugin.la libretrocl-plugin.la \ libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \ - libviews-plugin.la + libviews-plugin.la libdna-plugin.la nodist_property_DATA = ns-slapd.properties @@ -735,6 +735,13 @@ libviews_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) +#------------------------ +# libdna-plugin +#------------------------ +libdna_plugin_la_SOURCES = ldap/servers/plugins/dna/dna.c + +libdna_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) + #//////////////////////////////////////////////////////////////// # Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Makefile.in 26 Jan 2007 20:54:32 -0000 1.18 +++ Makefile.in 31 Jan 2007 22:49:19 -0000 1.19 @@ -233,6 +233,10 @@ am_libdistrib_plugin_la_OBJECTS = \ ldap/servers/plugins/distrib/libdistrib_plugin_la-distrib.lo libdistrib_plugin_la_OBJECTS = $(am_libdistrib_plugin_la_OBJECTS) +libdna_plugin_la_LIBADD = +am_libdna_plugin_la_OBJECTS = \ + ldap/servers/plugins/dna/libdna_plugin_la-dna.lo +libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS) libds_admin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libds_admin_la_OBJECTS = \ @@ -697,7 +701,8 @@ $(libchainingdb_plugin_la_SOURCES) \ $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \ $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \ - $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) \ + $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) \ + $(libhttp_client_plugin_la_SOURCES) \ $(libns_dshttpd_la_SOURCES) \ $(libpam_passthru_plugin_la_SOURCES) \ $(libpassthru_plugin_la_SOURCES) \ @@ -721,7 +726,8 @@ $(libchainingdb_plugin_la_SOURCES) \ $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \ $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \ - $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) \ + $(libdna_plugin_la_SOURCES) $(libds_admin_la_SOURCES) \ + $(libhttp_client_plugin_la_SOURCES) \ $(libns_dshttpd_la_SOURCES) \ $(libpam_passthru_plugin_la_SOURCES) \ $(libpassthru_plugin_la_SOURCES) \ @@ -960,7 +966,7 @@ libpassthru-plugin.la libpresence-plugin.la libpwdstorage-plugin.la \ libreferint-plugin.la libreplication-plugin.la libretrocl-plugin.la \ libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \ - libviews-plugin.la + libviews-plugin.la libdna-plugin.la nodist_property_DATA = ns-slapd.properties noinst_LIBRARIES = libavl.a libldaputil.a @@ -1599,6 +1605,12 @@ libviews_plugin_la_SOURCES = ldap/servers/plugins/views/views.c libviews_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) +#------------------------ +# libdna-plugin +#------------------------ +libdna_plugin_la_SOURCES = ldap/servers/plugins/dna/dna.c +libdna_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) + #//////////////////////////////////////////////////////////////// # # Programs @@ -2324,6 +2336,17 @@ ldap/servers/plugins/distrib/$(DEPDIR)/$(am__dirstamp) libdistrib-plugin.la: $(libdistrib_plugin_la_OBJECTS) $(libdistrib_plugin_la_DEPENDENCIES) $(LINK) -rpath $(serverplugindir) $(libdistrib_plugin_la_LDFLAGS) $(libdistrib_plugin_la_OBJECTS) $(libdistrib_plugin_la_LIBADD) $(LIBS) +ldap/servers/plugins/dna/$(am__dirstamp): + @$(mkdir_p) ldap/servers/plugins/dna + @: > ldap/servers/plugins/dna/$(am__dirstamp) +ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp): + @$(mkdir_p) ldap/servers/plugins/dna/$(DEPDIR) + @: > ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp) +ldap/servers/plugins/dna/libdna_plugin_la-dna.lo: \ + ldap/servers/plugins/dna/$(am__dirstamp) \ + ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp) +libdna-plugin.la: $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_DEPENDENCIES) + $(LINK) -rpath $(serverplugindir) $(libdna_plugin_la_LDFLAGS) $(libdna_plugin_la_OBJECTS) $(libdna_plugin_la_LIBADD) $(LIBS) ldap/admin/lib/$(am__dirstamp): @$(mkdir_p) ldap/admin/lib @: > ldap/admin/lib/$(am__dirstamp) @@ -3728,6 +3751,8 @@ -rm -f ldap/servers/plugins/cos/libcos_plugin_la-cos_cache.lo -rm -f ldap/servers/plugins/distrib/libdistrib_plugin_la-distrib.$(OBJEXT) -rm -f ldap/servers/plugins/distrib/libdistrib_plugin_la-distrib.lo + -rm -f ldap/servers/plugins/dna/libdna_plugin_la-dna.$(OBJEXT) + -rm -f ldap/servers/plugins/dna/libdna_plugin_la-dna.lo -rm -f ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.$(OBJEXT) -rm -f ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo -rm -f ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.$(OBJEXT) @@ -4482,6 +4507,7 @@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/cos/$(DEPDIR)/libcos_plugin_la-cos.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/cos/$(DEPDIR)/libcos_plugin_la-cos_cache.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/distrib/$(DEPDIR)/libdistrib_plugin_la-distrib.Plo at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/dna/$(DEPDIR)/libdna_plugin_la-dna.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_impl.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/pam_passthru/$(DEPDIR)/libpam_passthru_plugin_la-pam_ptconfig.Plo at am__quote@ @@ -5755,6 +5781,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdistrib_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/distrib/libdistrib_plugin_la-distrib.lo `test -f 'ldap/servers/plugins/distrib/distrib.c' || echo '$(srcdir)/'`ldap/servers/plugins/distrib/distrib.c +ldap/servers/plugins/dna/libdna_plugin_la-dna.lo: ldap/servers/plugins/dna/dna.c + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdna_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/dna/libdna_plugin_la-dna.lo -MD -MP -MF "ldap/servers/plugins/dna/$(DEPDIR)/libdna_plugin_la-dna.Tpo" -c -o ldap/servers/plugins/dna/libdna_plugin_la-dna.lo `test -f 'ldap/servers/plugins/dna/dna.c' || echo '$(srcdir)/'`ldap/servers/plugins/dna/dna.c; \ + at am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/dna/$(DEPDIR)/libdna_plugin_la-dna.Tpo" "ldap/servers/plugins/dna/$(DEPDIR)/libdna_plugin_la-dna.Plo"; else rm -f "ldap/servers/plugins/dna/$(DEPDIR)/libdna_plugin_la-dna.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/dna/dna.c' object='ldap/servers/plugins/dna/libdna_plugin_la-dna.lo' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdna_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/dna/libdna_plugin_la-dna.lo `test -f 'ldap/servers/plugins/dna/dna.c' || echo '$(srcdir)/'`ldap/servers/plugins/dna/dna.c + ldap/admin/lib/libds_admin_la-dsalib_conf.lo: ldap/admin/lib/dsalib_conf.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/admin/lib/libds_admin_la-dsalib_conf.lo -MD -MP -MF "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo" -c -o ldap/admin/lib/libds_admin_la-dsalib_conf.lo `test -f 'ldap/admin/lib/dsalib_conf.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_conf.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo" "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Plo"; else rm -f "ldap/admin/lib/$(DEPDIR)/libds_admin_la-dsalib_conf.Tpo"; exit 1; fi @@ -8514,6 +8547,7 @@ -rm -rf ldap/servers/plugins/collation/.libs ldap/servers/plugins/collation/_libs -rm -rf ldap/servers/plugins/cos/.libs ldap/servers/plugins/cos/_libs -rm -rf ldap/servers/plugins/distrib/.libs ldap/servers/plugins/distrib/_libs + -rm -rf ldap/servers/plugins/dna/.libs ldap/servers/plugins/dna/_libs -rm -rf ldap/servers/plugins/http/.libs ldap/servers/plugins/http/_libs -rm -rf ldap/servers/plugins/pam_passthru/.libs ldap/servers/plugins/pam_passthru/_libs -rm -rf ldap/servers/plugins/passthru/.libs ldap/servers/plugins/passthru/_libs @@ -8831,6 +8865,8 @@ -rm -f ldap/servers/plugins/cos/$(am__dirstamp) -rm -f ldap/servers/plugins/distrib/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/servers/plugins/distrib/$(am__dirstamp) + -rm -f ldap/servers/plugins/dna/$(DEPDIR)/$(am__dirstamp) + -rm -f ldap/servers/plugins/dna/$(am__dirstamp) -rm -f ldap/servers/plugins/http/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/servers/plugins/http/$(am__dirstamp) -rm -f ldap/servers/plugins/pam_passthru/$(DEPDIR)/$(am__dirstamp) @@ -8899,7 +8935,7 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/se! rvers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/se! rvers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -8931,7 +8967,7 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/se! rvers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/se! rvers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic