[ooo-build-commit] 6 commits - distro-configs/SUSE-10.1.conf.in distro-configs/SUSE-10.3.conf.in distro-configs/SUSE-11.0.conf.in patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Mon Oct 12 09:28:45 PDT 2009
distro-configs/SUSE-10.1.conf.in | 1
distro-configs/SUSE-10.3.conf.in | 1
distro-configs/SUSE-11.0.conf.in | 1
patches/dev300/apply | 15
patches/dev300/build-accessibility-dep.diff | 8
patches/dev300/build-java-1.4-UnoRuntime-queryInterface.diff | 685 +++
patches/dev300/build-java-1.4-regcomp.diff | 84
patches/dev300/cancas-cairo-linkflags.diff | 20
patches/dev300/libxmlsec-system-nss.diff | 2363 -----------
9 files changed, 852 insertions(+), 2326 deletions(-)
New commits:
commit 536f601057e1520cd11b377c42649e2f072dcdc5
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 12 17:56:10 2009 +0200
Define LD_LIBRARY_PATH for regcomp when build with Java 1.4 on SLED10
* patches/dev300/build-java-1.4-regcomp.diff:
* patches/dev300/apply: (Java14, SLED10Only) there are hacks to avoid
LD_LIBRARY_PATH during build, see i#97992; it somewhat does not work with Sun
Java 1.4; the paths are probably hardcoded somewhere but where? the old
solution with shell wrapper is good enough in this case
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b9a7253..589a6e8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1161,6 +1161,11 @@ build-java-1.4-no-Xbootclasspath.diff, i#12345, pmladek
# fortunately, the java semantic did not allow to change the other locations
# where this method was used
build-java-1.4-UnoRuntime-queryInterface.diff, i#12345, pmladek
+# there are hacks to avoid LD_LIBRARY_PATH during build, see i#97992
+# it somewhat does not work with Sun Java 1.4
+# the paths are probably hardcoded somewhere but where?
+# the old solution with shell wrapper is good enough in this case
+build-java-1.4-regcomp.diff, i#12345, pmladek
# another fallback to load libhsqldb with JRE 1.4
connectivity-load-libhsqldb-with-jre-1.4.diff, n#431360, pmladek
diff --git a/patches/dev300/build-java-1.4-regcomp.diff b/patches/dev300/build-java-1.4-regcomp.diff
new file mode 100644
index 0000000..b514dec
--- /dev/null
+++ b/patches/dev300/build-java-1.4-regcomp.diff
@@ -0,0 +1,84 @@
+--- /dev/null 2009-10-09 20:25:00.000000000 +0200
++++ cpputools/source/registercomponent/regcomp.sh 2009-10-09 18:21:01.000000000 +0200
+@@ -0,0 +1,51 @@
++#!/bin/sh
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: startup.sh,v $
++#
++# $Revision: 1.4.10.1 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org 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 Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org. If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++# Pass -env arguments on to javaldx; needs to be fixed:
++my_envargs=
++for my_arg in "$@" ; do
++ case ${my_arg} in
++ -env:*) my_envargs="${my_envargs} ${my_arg}" ;;
++ esac
++done
++
++# Extend the LD_LIBRARY_PATH for Java:
++epath=`dirname "$0"`
++if [ -x "${epath}/javaldx" ] ; then
++ jpath=`"${epath}/javaldx" $my_envargs`
++ if [ -n "${jpath}" ]; then
++ LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
++ export LD_LIBRARY_PATH
++ fi
++fi
++
++exec "$0.bin" "$@"
+--- cpputools/source/registercomponent/makefile.mk.old 2009-09-25 00:39:01.000000000 +0200
++++ cpputools/source/registercomponent/makefile.mk 2009-10-09 20:24:02.000000000 +0200
+@@ -45,6 +45,7 @@ UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+ NO_OFFUH=TRUE
+ CPPUMAKERFLAGS += -C
+
++UNIXTEXT= $(MISC)$/regcomp.sh
+ UNOTYPES=\
+ com.sun.star.uno.TypeClass \
+ com.sun.star.lang.XMultiServiceFactory \
+@@ -77,3 +78,10 @@ APP1STDLIBS+= \
+
+
+ .INCLUDE : target.mk
++
++.IF "$(GUI)"=="UNX"
++ALLTAR: REGCOMPSH
++
++REGCOMPSH : $(UNIXTEXT)
++ +-chmod +x $(UNIXTEXT)
++.ENDIF
+--- cpputools/prj/d.lst.old 2009-09-25 00:39:01.000000000 +0200
++++ cpputools/prj/d.lst 2009-10-09 20:25:39.000000000 +0200
+@@ -1,5 +1,5 @@
+ ..\%__SRC%\bin\regcomp.exe %_DEST%\bin%_EXT%\regcomp.exe
+-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp
++..\%__SRC%\misc\regcomp.sh %_DEST%\bin%_EXT%\regcomp
+ ..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp.bin
+ ..\%__SRC%\bin\regcomplazy.exe %_DEST%\bin%_EXT%\regcomplazy.exe
+ ..\%__SRC%\bin\regcomplazy %_DEST%\bin%_EXT%\regcomplazy
commit 4334c4d0204c25fa6fabc36d48757a4dae55991a
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 12 17:51:59 2009 +0200
Revert older UnoRuntime.queryInterface declaration for Java-1.4 (SLED10)
* patches/dev300/build-java-1.4-UnoRuntime-queryInterface.diff:
* patches/dev300/apply: the new UnoRuntime.queryInterface declaration uses
Java-1.5 feature and can't be used on SLED10 with the default Java 1.4;
it looks safe to revert it for SLED10; see also i#102469
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 13b65eb..b9a7253 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1157,6 +1157,10 @@ build-java-1.4-qadevOOo.diff, i#12345, pmladek
build-java-1.4-wizards.diff, i#12345, pmladek
# Sun Java 1.4 does not know the -Xbootclasspath option, will not go upstream
build-java-1.4-no-Xbootclasspath.diff, i#12345, pmladek
+# the new declaration was supported only by Java 1.5, see i#102469
+# fortunately, the java semantic did not allow to change the other locations
+# where this method was used
+build-java-1.4-UnoRuntime-queryInterface.diff, i#12345, pmladek
# another fallback to load libhsqldb with JRE 1.4
connectivity-load-libhsqldb-with-jre-1.4.diff, n#431360, pmladek
diff --git a/patches/dev300/build-java-1.4-UnoRuntime-queryInterface.diff b/patches/dev300/build-java-1.4-UnoRuntime-queryInterface.diff
new file mode 100644
index 0000000..689e68c
--- /dev/null
+++ b/patches/dev300/build-java-1.4-UnoRuntime-queryInterface.diff
@@ -0,0 +1,685 @@
+--- ridljar/com/sun/star/uno/UnoRuntime.java.old 2009-09-25 00:39:01.000000000 +0200
++++ ridljar/com/sun/star/uno/UnoRuntime.java 2009-10-09 17:56:32.000000000 +0200
+@@ -179,9 +179,8 @@ public class UnoRuntime {
+ * otherwise <code>null</code>
+ * @see #queryInterface(Type, Object)
+ */
+- @SuppressWarnings("unchecked")
+- public static <T> T queryInterface(Class<T> zInterface, Object object) {
+- return (T) queryInterface(new Type(zInterface), object);
++ public static Object queryInterface(Class zInterface, Object object) {
++ return queryInterface(new Type(zInterface), object);
+ }
+
+ /**
+--- jurt/com/sun/star/comp/urlresolver/UrlResolver.java.old 2009-09-25 00:39:01.000000000 +0200
++++ jurt/com/sun/star/comp/urlresolver/UrlResolver.java 2009-10-09 18:12:59.000000000 +0200
+@@ -102,7 +102,7 @@ public class UrlResolver {
+ Object rootObject = null;
+ XBridgeFactory xBridgeFactory= null;
+ try {
+- xBridgeFactory = UnoRuntime.queryInterface(XBridgeFactory.class,
++ xBridgeFactory = (XBridgeFactory) UnoRuntime.queryInterface(XBridgeFactory.class,
+ _xMultiServiceFactory.createInstance("com.sun.star.bridge.BridgeFactory"));
+ } catch (com.sun.star.uno.Exception e) {
+ throw new com.sun.star.uno.RuntimeException(e.getMessage());
+@@ -117,7 +117,7 @@ public class UrlResolver {
+ throw new com.sun.star.uno.RuntimeException(e.getMessage());
+ }
+
+- XConnector connector_xConnector = UnoRuntime.queryInterface(XConnector.class, connector);
++ XConnector connector_xConnector = (XConnector) UnoRuntime.queryInterface(XConnector.class, connector);
+
+ // connect to the server
+ XConnection xConnection = connector_xConnector.connect(conDcp);
+--- jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java.old 2009-09-25 00:39:01.000000000 +0200
++++ jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java 2009-10-09 18:17:02.000000000 +0200
+@@ -134,7 +134,7 @@ public class BridgeFactory implements XB
+ if (hasName) {
+ IBridge iBridges[] = UnoRuntime.getBridges();
+ for(int i = 0; i < iBridges.length; ++ i) {
+- XBridge xBridge = UnoRuntime.queryInterface(XBridge.class, iBridges[i]);
++ XBridge xBridge = (XBridge) UnoRuntime.queryInterface(XBridge.class, iBridges[i]);
+
+ if(xBridge != null) {
+ if(xBridge.getName().equals(sName))
+@@ -148,7 +148,7 @@ public class BridgeFactory implements XB
+ try {
+ IBridge iBridge = UnoRuntime.getBridgeByName("java", context, "remote", context, hasName ? new Object[]{sProtocol, aConnection, anInstanceProvider, sName} : new Object[]{sProtocol, aConnection, anInstanceProvider});
+
+- xBridge = UnoRuntime.queryInterface(XBridge.class, iBridge);
++ xBridge = (XBridge) UnoRuntime.queryInterface(XBridge.class, iBridge);
+ }
+ catch(Exception exception) {
+ throw new com.sun.star.lang.IllegalArgumentException(exception.getMessage());
+@@ -171,7 +171,7 @@ public class BridgeFactory implements XB
+
+ IBridge iBridges[] = UnoRuntime.getBridges();
+ for(int i = 0; i < iBridges.length; ++ i) {
+- xBridge = UnoRuntime.queryInterface(XBridge.class, iBridges[i]);
++ xBridge = (XBridge) UnoRuntime.queryInterface(XBridge.class, iBridges[i]);
+
+ if(xBridge != null) {
+ if(xBridge.getName().equals(sName))
+@@ -199,7 +199,7 @@ public class BridgeFactory implements XB
+
+ IBridge iBridges[] = UnoRuntime.getBridges();
+ for(int i = 0; i < iBridges.length; ++ i) {
+- XBridge xBridge = UnoRuntime.queryInterface(XBridge.class, iBridges[i]);
++ XBridge xBridge = (XBridge) UnoRuntime.queryInterface(XBridge.class, iBridges[i]);
+
+ if(xBridge != null)
+ vector.addElement(xBridge);
+--- jurt/com/sun/star/comp/servicemanager/ServiceManager.java.old 2009-09-25 00:39:01.000000000 +0200
++++ jurt/com/sun/star/comp/servicemanager/ServiceManager.java 2009-10-09 18:15:43.000000000 +0200
+@@ -158,7 +158,7 @@ public class ServiceManager implements X
+ if (loaderObj == null)
+ throw new com.sun.star.uno.Exception("Can get an instance of com.sun.star.loader.Java");
+
+- return UnoRuntime.queryInterface( XImplementationLoader.class, loaderObj );
++ return (XImplementationLoader) UnoRuntime.queryInterface( XImplementationLoader.class, loaderObj );
+ }
+
+ /**
+@@ -335,7 +335,7 @@ public class ServiceManager implements X
+ if (DEBUG) {
+ if (factory == null) System.err.println("service not registered");
+ else
+- System.err.println("service found:" + factory + " " + UnoRuntime.queryInterface(XSingleServiceFactory.class, factory));
++ System.err.println("service found:" + factory + " " + (XSingleServiceFactory) UnoRuntime.queryInterface(XSingleServiceFactory.class, factory));
+ }
+
+ if (factory == null)
+@@ -380,7 +380,7 @@ public class ServiceManager implements X
+ Object fac = queryServiceFactory( rServiceSpecifier );
+ if (fac != null)
+ {
+- XSingleComponentFactory xCompFac = UnoRuntime.queryInterface(
++ XSingleComponentFactory xCompFac = (XSingleComponentFactory) UnoRuntime.queryInterface(
+ XSingleComponentFactory.class, fac );
+ if (xCompFac != null)
+ {
+@@ -388,7 +388,7 @@ public class ServiceManager implements X
+ }
+ else
+ {
+- XSingleServiceFactory xServiceFac = UnoRuntime.queryInterface(
++ XSingleServiceFactory xServiceFac = (XSingleServiceFactory) UnoRuntime.queryInterface(
+ XSingleServiceFactory.class, fac );
+ if (xServiceFac != null)
+ {
+@@ -422,7 +422,7 @@ public class ServiceManager implements X
+ Object fac = queryServiceFactory( rServiceSpecifier );
+ if (fac != null)
+ {
+- XSingleComponentFactory xCompFac = UnoRuntime.queryInterface(
++ XSingleComponentFactory xCompFac = (XSingleComponentFactory) UnoRuntime.queryInterface(
+ XSingleComponentFactory.class, fac );
+ if (xCompFac != null)
+ {
+@@ -430,7 +430,7 @@ public class ServiceManager implements X
+ }
+ else
+ {
+- XSingleServiceFactory xServiceFac = UnoRuntime.queryInterface(
++ XSingleServiceFactory xServiceFac = (XSingleServiceFactory) UnoRuntime.queryInterface(
+ XSingleServiceFactory.class, fac );
+ if (xServiceFac != null)
+ {
+@@ -528,7 +528,7 @@ public class ServiceManager implements X
+ if (object == null)
+ throw new com.sun.star.uno.RuntimeException("The parameter must not been null");
+
+- XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, object);
++ XServiceInfo xServiceInfo = (XServiceInfo) UnoRuntime.queryInterface(XServiceInfo.class, object);
+
+ if (xServiceInfo != null) {
+ return UnoRuntime.areSame(factoriesByImplNames.get(xServiceInfo.getImplementationName()), object);
+@@ -552,7 +552,7 @@ public class ServiceManager implements X
+ if (object == null) throw new com.sun.star.lang.IllegalArgumentException();
+
+ XServiceInfo xServiceInfo =
+- UnoRuntime.queryInterface(XServiceInfo.class, object);
++ (XServiceInfo) UnoRuntime.queryInterface(XServiceInfo.class, object);
+
+ if (xServiceInfo == null)
+ throw new com.sun.star.lang.IllegalArgumentException(
+@@ -606,7 +606,7 @@ public class ServiceManager implements X
+ );
+
+ XServiceInfo xServiceInfo =
+- UnoRuntime.queryInterface(XServiceInfo.class, object);
++ (XServiceInfo) UnoRuntime.queryInterface(XServiceInfo.class, object);
+
+ if (xServiceInfo == null)
+ throw new com.sun.star.lang.IllegalArgumentException(
+@@ -614,7 +614,7 @@ public class ServiceManager implements X
+ );
+
+ XSingleServiceFactory xSingleServiceFactory =
+- UnoRuntime.queryInterface(XSingleServiceFactory.class, object);
++ (XSingleServiceFactory) UnoRuntime.queryInterface(XSingleServiceFactory.class, object);
+
+ if (xSingleServiceFactory == null)
+ throw new com.sun.star.lang.IllegalArgumentException(
+--- jurt/com/sun/star/comp/loader/JavaLoader.java.old 2009-09-25 00:39:01.000000000 +0200
++++ jurt/com/sun/star/comp/loader/JavaLoader.java 2009-10-09 18:18:03.000000000 +0200
+@@ -103,7 +103,7 @@ public class JavaLoader implements XImpl
+ if (m_xMacroExpander == null)
+ {
+ XPropertySet xProps =
+- UnoRuntime.queryInterface(
++ (XPropertySet) UnoRuntime.queryInterface(
+ XPropertySet.class, multiServiceFactory );
+ if (xProps == null)
+ {
+--- jurt/com/sun/star/comp/loader/FactoryHelper.java.old 2009-09-25 00:39:01.000000000 +0200
++++ jurt/com/sun/star/comp/loader/FactoryHelper.java 2009-10-09 18:12:19.000000000 +0200
+@@ -174,7 +174,7 @@ public class FactoryHelper {
+ {
+ if (xContext != null)
+ {
+- return UnoRuntime.queryInterface(
++ return (XMultiServiceFactory) UnoRuntime.queryInterface(
+ XMultiServiceFactory.class, xContext.getServiceManager() );
+ }
+ else
+@@ -302,7 +302,7 @@ public class FactoryHelper {
+ Object instance = _constructor.newInstance( args );
+ if (bInitCall)
+ {
+- XInitialization xInitialization = UnoRuntime.queryInterface(
++ XInitialization xInitialization = (XInitialization) UnoRuntime.queryInterface(
+ XInitialization.class, instance );
+ if (xInitialization != null)
+ {
+--- jurt/com/sun/star/uno/WeakReference.java.old 2009-09-25 00:39:01.000000000 +0200
++++ jurt/com/sun/star/uno/WeakReference.java 2009-10-09 18:09:30.000000000 +0200
+@@ -61,7 +61,7 @@ public class WeakReference
+ Object weakImpl= obj.get();
+ if (weakImpl != null)
+ {
+- XWeak weak= UnoRuntime.queryInterface(XWeak.class, weakImpl);
++ XWeak weak= (XWeak) UnoRuntime.queryInterface(XWeak.class, weakImpl);
+ if (weak != null)
+ {
+ XAdapter adapter= (XAdapter) weak.queryAdapter();
+@@ -77,7 +77,7 @@ public class WeakReference
+ */
+ public WeakReference(Object obj)
+ {
+- XWeak weak= UnoRuntime.queryInterface(XWeak.class, obj);
++ XWeak weak= (XWeak) UnoRuntime.queryInterface(XWeak.class, obj);
+ if (weak != null)
+ {
+ XAdapter adapter= (XAdapter) weak.queryAdapter();
+--- javaunohelper/com/sun/star/lib/uno/helper/Factory.java.old 2009-09-25 00:39:01.000000000 +0200
++++ javaunohelper/com/sun/star/lib/uno/helper/Factory.java 2009-10-09 18:45:41.000000000 +0200
+@@ -210,7 +210,7 @@ public class Factory
+ throws com.sun.star.uno.Exception
+ {
+ Object inst = instantiate( xContext );
+- XInitialization xInit = UnoRuntime.queryInterface(
++ XInitialization xInit = (XInitialization) UnoRuntime.queryInterface(
+ XInitialization.class, inst );
+ if (null == xInit)
+ {
+--- javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java.old 2009-09-25 00:39:01.000000000 +0200
++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java 2009-10-09 18:45:02.000000000 +0200
+@@ -671,7 +671,7 @@ XMultiPropertySet
+ // We try to get an XInterface of setVal and set an XInterface type.
+ if (setVal instanceof XInterface)
+ {
+- XInterface xint= UnoRuntime.queryInterface(XInterface.class, setVal);
++ XInterface xint= (XInterface) UnoRuntime.queryInterface(XInterface.class, setVal);
+ if (xint != null)
+ convObj= new Any(new Type(XInterface.class), xint);
+ }
+--- javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java.old 2009-09-25 00:39:01.000000000 +0200
++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java 2009-10-09 19:01:30.000000000 +0200
+@@ -143,13 +143,13 @@ public final class PropertySetMixin {
+ idlClass = getReflection(type.getTypeName());
+ XTypeDescription ifc;
+ try {
+- ifc = UnoRuntime.queryInterface(
++ ifc = (XTypeDescription) UnoRuntime.queryInterface(
+ XTypeDescription.class,
+- (UnoRuntime.queryInterface(
+- XHierarchicalNameAccess.class,
+- context.getValueByName(
+- "/singletons/com.sun.star.reflection."
+- + "theTypeDescriptionManager")).
++ (((XHierarchicalNameAccess) UnoRuntime.queryInterface(
++ XHierarchicalNameAccess.class,
++ context.getValueByName(
++ "/singletons/com.sun.star.reflection."
++ + "theTypeDescriptionManager"))).
+ getByHierarchicalName(type.getTypeName())));
+ } catch (NoSuchElementException e) {
+ throw new RuntimeException(
+@@ -585,7 +585,7 @@ public final class PropertySetMixin {
+ private XIdlClass getReflection(String typeName) {
+ XIdlReflection refl;
+ try {
+- refl = UnoRuntime.queryInterface(
++ refl = (XIdlReflection) UnoRuntime.queryInterface(
+ XIdlReflection.class,
+ context.getServiceManager().createInstanceWithContext(
+ "com.sun.star.reflection.CoreReflection", context));
+@@ -599,7 +599,8 @@ public final class PropertySetMixin {
+ try {
+ return refl.forName(typeName);
+ } finally {
+- XComponent comp = UnoRuntime.queryInterface(XComponent.class, refl);
++ XComponent comp = (XComponent) UnoRuntime.queryInterface(
++ XComponent.class, refl);
+ if (comp != null) {
+ comp.dispose();
+ }
+@@ -609,8 +610,9 @@ public final class PropertySetMixin {
+ private void initProperties(
+ XTypeDescription type, HashMap map, ArrayList handleNames, HashSet seen)
+ {
+- XInterfaceTypeDescription2 ifc = UnoRuntime.queryInterface(
+- XInterfaceTypeDescription2.class, resolveTypedefs(type));
++ XInterfaceTypeDescription2 ifc = (XInterfaceTypeDescription2)
++ UnoRuntime.queryInterface(
++ XInterfaceTypeDescription2.class, resolveTypedefs(type));
+ if (seen.add(ifc.getName())) {
+ XTypeDescription[] bases = ifc.getBaseTypes();
+ for (int i = 0; i < bases.length; ++i) {
+@@ -620,10 +622,11 @@ public final class PropertySetMixin {
+ for (int i = 0; i < members.length; ++i) {
+ if (members[i].getTypeClass() == TypeClass.INTERFACE_ATTRIBUTE)
+ {
+- XInterfaceAttributeTypeDescription2 attr =
+- UnoRuntime.queryInterface(
+- XInterfaceAttributeTypeDescription2.class,
+- members[i]);
++ XInterfaceAttributeTypeDescription2 attr
++ = ((XInterfaceAttributeTypeDescription2)
++ UnoRuntime.queryInterface(
++ XInterfaceAttributeTypeDescription2.class,
++ members[i]));
+ short attrAttribs = 0;
+ if (attr.isBound()) {
+ attrAttribs |= PropertyAttribute.BOUND;
+@@ -682,7 +685,7 @@ public final class PropertySetMixin {
+ break;
+ }
+ attrAttribs |= n;
+- t = (UnoRuntime.queryInterface(
++ t = ((XStructTypeDescription) UnoRuntime.queryInterface(
+ XStructTypeDescription.class, t)).
+ getTypeArguments()[0];
+ }
+@@ -744,14 +747,14 @@ public final class PropertySetMixin {
+ object, illegalArgumentPosition);
+
+ }
+- XIdlField2 f = UnoRuntime.queryInterface(
++ XIdlField2 f = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2.class, idlClass.getField(name));
+ Object[] o = new Object[] {
+ new Any(type, UnoRuntime.queryInterface(type, object)) };
+ Object v = wrapValue(
+ value,
+- UnoRuntime.queryInterface(
+- XIdlField2.class, idlClass.getField(name)).getType(),
++ ((XIdlField2) UnoRuntime.queryInterface(
++ XIdlField2.class, idlClass.getField(name))).getType(),
+ (p.property.Attributes & PropertyAttribute.MAYBEAMBIGUOUS) != 0,
+ isAmbiguous,
+ (p.property.Attributes & PropertyAttribute.MAYBEDEFAULT) != 0,
+@@ -804,7 +807,7 @@ public final class PropertySetMixin {
+ if (p == null) {
+ throw new UnknownPropertyException(name, object);
+ }
+- XIdlField2 field = UnoRuntime.queryInterface(
++ XIdlField2 field = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2.class, idlClass.getField(name));
+ Object value;
+ try {
+@@ -845,12 +848,12 @@ public final class PropertySetMixin {
+ XIdlClass ambiguous = getReflection(typeName);
+ try {
+ isAmbiguous = AnyConverter.toBoolean(
+- UnoRuntime.queryInterface(
++ ((XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2.class,
+- ambiguous.getField("IsAmbiguous")).get(value));
+- value = UnoRuntime.queryInterface(
+- XIdlField2.class,
+- ambiguous.getField("Value")).get(value);
++ ambiguous.getField("IsAmbiguous"))).get(value));
++ value = ((XIdlField2) UnoRuntime.queryInterface(
++ XIdlField2.class,
++ ambiguous.getField("Value"))).get(value);
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
+ throw new RuntimeException(
+ "unexpected"
+@@ -864,12 +867,12 @@ public final class PropertySetMixin {
+ XIdlClass defaulted = getReflection(typeName);
+ try {
+ isDefaulted = AnyConverter.toBoolean(
+- UnoRuntime.queryInterface(
++ ((XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2.class,
+- defaulted.getField("IsDefaulted")).get(value));
+- value = UnoRuntime.queryInterface(
+- XIdlField2.class,
+- defaulted.getField("Value")).get(value);
++ defaulted.getField("IsDefaulted"))).get(value));
++ value = ((XIdlField2) UnoRuntime.queryInterface(
++ XIdlField2.class,
++ defaulted.getField("Value"))).get(value);
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
+ throw new RuntimeException(
+ "unexpected"
+@@ -883,16 +886,16 @@ public final class PropertySetMixin {
+ XIdlClass optional = getReflection(typeName);
+ try {
+ boolean present = AnyConverter.toBoolean(
+- UnoRuntime.queryInterface(
++ ((XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2.class,
+- optional.getField("IsPresent")).get(value));
++ optional.getField("IsPresent"))).get(value));
+ if (!present) {
+ value = Any.VOID;
+ break;
+ }
+- value = UnoRuntime.queryInterface(
+- XIdlField2.class,
+- optional.getField("Value")).get(value);
++ value = ((XIdlField2) UnoRuntime.queryInterface(
++ XIdlField2.class,
++ optional.getField("Value"))).get(value);
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
+ throw new RuntimeException(
+ "unexpected"
+@@ -929,15 +932,15 @@ public final class PropertySetMixin {
+ Object[] strct = new Object[1];
+ type.createObject(strct);
+ try {
+- XIdlField2 field = UnoRuntime.queryInterface(
++ XIdlField2 field = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2.class, type.getField("Value"));
+ field.set(
+ strct,
+ wrapValue(
+ value, field.getType(), false, false, wrapDefaulted,
+ isDefaulted, wrapOptional));
+- UnoRuntime.queryInterface(
+- XIdlField2.class, type.getField("IsAmbiguous")).set(
++ ((XIdlField2) UnoRuntime.queryInterface(
++ XIdlField2.class, type.getField("IsAmbiguous"))).set(
+ strct, new Boolean(isAmbiguous));
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
+ throw new RuntimeException(
+@@ -956,15 +959,15 @@ public final class PropertySetMixin {
+ Object[] strct = new Object[1];
+ type.createObject(strct);
+ try {
+- XIdlField2 field = UnoRuntime.queryInterface(
++ XIdlField2 field = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2.class, type.getField("Value"));
+ field.set(
+ strct,
+ wrapValue(
+ value, field.getType(), wrapAmbiguous, isAmbiguous,
+ false, false, wrapOptional));
+- UnoRuntime.queryInterface(
+- XIdlField2.class, type.getField("IsDefaulted")).set(
++ ((XIdlField2) UnoRuntime.queryInterface(
++ XIdlField2.class, type.getField("IsDefaulted"))).set(
+ strct, new Boolean(isDefaulted));
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
+ throw new RuntimeException(
+@@ -983,11 +986,11 @@ public final class PropertySetMixin {
+ type.createObject(strct);
+ boolean present = !AnyConverter.isVoid(value);
+ try {
+- UnoRuntime.queryInterface(
+- XIdlField2.class, type.getField("IsPresent")).set(
++ ((XIdlField2) UnoRuntime.queryInterface(
++ XIdlField2.class, type.getField("IsPresent"))).set(
+ strct, new Boolean(present));
+ if (present) {
+- XIdlField2 field = UnoRuntime.queryInterface(
++ XIdlField2 field = (XIdlField2) UnoRuntime.queryInterface(
+ XIdlField2.class, type.getField("Value"));
+ field.set(
+ strct,
+@@ -1015,8 +1018,9 @@ public final class PropertySetMixin {
+
+ private static XTypeDescription resolveTypedefs(XTypeDescription type) {
+ while (type.getTypeClass() == TypeClass.TYPEDEF) {
+- type = UnoRuntime.queryInterface(
+- XIndirectTypeDescription.class, type).getReferencedType();
++ type = ((XIndirectTypeDescription) UnoRuntime.queryInterface(
++ XIndirectTypeDescription.class, type)).
++ getReferencedType();
+ }
+ return type;
+ }
+--- javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java.old 2009-09-25 00:39:01.000000000 +0200
++++ javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java 2009-10-09 18:45:19.000000000 +0200
+@@ -715,7 +715,7 @@ public class InterfaceContainer implemen
+ try
+ {
+ Object o= aIt.next();
+- XEventListener evtListener= UnoRuntime.queryInterface(
++ XEventListener evtListener= (XEventListener) UnoRuntime.queryInterface(
+ XEventListener.class, o);
+ if( evtListener != null )
+ evtListener.disposing( evt );
+--- javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java.old 2009-09-25 00:39:01.000000000 +0200
++++ javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java 2009-10-09 18:44:35.000000000 +0200
+@@ -119,7 +119,7 @@ class InteractionImpl implements com.sun
+ if (approve)
+ {
+ com.sun.star.task.XInteractionApprove xApprove =
+- UnoRuntime.queryInterface(com.sun.star.task.XInteractionApprove.class, conts[i]);
++ (com.sun.star.task.XInteractionApprove) UnoRuntime.queryInterface(com.sun.star.task.XInteractionApprove.class, conts[i]);
+ if (xApprove != null)
+ xApprove.select();
+ //don't query again for ongoing extensions
+@@ -128,7 +128,7 @@ class InteractionImpl implements com.sun
+ else if (abort)
+ {
+ com.sun.star.task.XInteractionAbort xAbort =
+- UnoRuntime.queryInterface(com.sun.star.task.XInteractionAbort.class, conts[i]);
++ (com.sun.star.task.XInteractionAbort) UnoRuntime.queryInterface(com.sun.star.task.XInteractionAbort.class, conts[i]);
+ if (xAbort != null)
+ xAbort.select();
+ //don't query again for ongoing extensions
+--- javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java.old 2009-09-25 00:39:01.000000000 +0200
++++ javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory.java 2009-10-09 18:40:28.000000000 +0200
+@@ -124,7 +124,7 @@ public class RegistryServiceFactory {
+ Object obj = createRegistryServiceFactory(
+ writeRegistryFile, readRegistryFile, readOnly,
+ RegistryServiceFactory.class.getClassLoader() );
+- return UnoRuntime.queryInterface(
++ return (XMultiServiceFactory) UnoRuntime.queryInterface(
+ XMultiServiceFactory.class, obj );
+ }
+
+--- javaunohelper/com/sun/star/comp/helper/ComponentContext.java.old 2009-09-25 00:39:01.000000000 +0200
++++ javaunohelper/com/sun/star/comp/helper/ComponentContext.java 2009-10-09 18:41:44.000000000 +0200
+@@ -101,7 +101,7 @@ public class ComponentContext implements
+ {
+ o = ((ComponentContextEntry)o).m_value;
+ }
+- m_xSMgr = UnoRuntime.queryInterface(
++ m_xSMgr = (XMultiComponentFactory) UnoRuntime.queryInterface(
+ XMultiComponentFactory.class, o );
+ }
+ if (m_xSMgr != null)
+@@ -114,7 +114,7 @@ public class ComponentContext implements
+ }
+
+ // listen for delegate
+- XComponent xComp = UnoRuntime.queryInterface(
++ XComponent xComp = (XComponent) UnoRuntime.queryInterface(
+ XComponent.class, m_xDelegate );
+ if (xComp != null)
+ {
+@@ -154,7 +154,7 @@ public class ComponentContext implements
+ else
+ {
+ XSingleComponentFactory xCompFac =
+- UnoRuntime.queryInterface(
++ (XSingleComponentFactory) UnoRuntime.queryInterface(
+ XSingleComponentFactory.class, entry.m_lateInit );
+ if (xCompFac != null)
+ {
+@@ -185,7 +185,7 @@ public class ComponentContext implements
+ else // inited in the meantime
+ {
+ // dispose fresh service instance
+- XComponent xComp = UnoRuntime.queryInterface(
++ XComponent xComp = (XComponent) UnoRuntime.queryInterface(
+ XComponent.class, xInstance );
+ if (xComp != null)
+ {
+@@ -253,7 +253,7 @@ public class ComponentContext implements
+ o = ((ComponentContextEntry)o).m_value;
+ }
+
+- XComponent xComp = UnoRuntime.queryInterface( XComponent.class, o );
++ XComponent xComp = (XComponent) UnoRuntime.queryInterface( XComponent.class, o );
+ if (xComp != null)
+ {
+ if (name.equals( TDMGR_NAME ))
+@@ -272,7 +272,7 @@ public class ComponentContext implements
+ // smgr
+ if (m_bDisposeSMgr)
+ {
+- XComponent xComp = UnoRuntime.queryInterface(
++ XComponent xComp = (XComponent) UnoRuntime.queryInterface(
+ XComponent.class, m_xSMgr );
+ if (xComp != null)
+ {
+--- javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java.old 2009-09-25 00:39:01.000000000 +0200
++++ javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java 2009-10-09 18:40:08.000000000 +0200
+@@ -85,7 +85,7 @@ public class SharedLibraryLoader {
+ XMultiServiceFactory smgr,
+ XRegistryKey regKey )
+ {
+- return UnoRuntime.queryInterface(
++ return (XSingleServiceFactory) UnoRuntime.queryInterface(
+ XSingleServiceFactory.class,
+ component_getFactory(
+ DEFAULT_LIBRARY, DEFAULT_IMPLEMENTATION, smgr, regKey,
+@@ -110,7 +110,7 @@ public class SharedLibraryLoader {
+ XMultiServiceFactory smgr,
+ XRegistryKey regKey )
+ {
+- return UnoRuntime.queryInterface(
++ return (XSingleServiceFactory) UnoRuntime.queryInterface(
+ XSingleServiceFactory.class,
+ component_getFactory(
+ libName, impName, smgr, regKey,
+--- javaunohelper/com/sun/star/comp/helper/Bootstrap.java.old 2009-09-25 00:39:01.000000000 +0200
++++ javaunohelper/com/sun/star/comp/helper/Bootstrap.java 2009-10-09 18:43:54.000000000 +0200
+@@ -108,20 +108,20 @@ public class Bootstrap {
+ static public XComponentContext createInitialComponentContext( Hashtable context_entries )
+ throws Exception
+ {
+- XImplementationLoader xImpLoader = UnoRuntime.queryInterface(
++ XImplementationLoader xImpLoader = (XImplementationLoader) UnoRuntime.queryInterface(
+ XImplementationLoader.class, new JavaLoader() );
+
+ // Get the factory of the ServiceManager
+- XSingleComponentFactory smgr_fac = UnoRuntime.queryInterface(
++ XSingleComponentFactory smgr_fac = (XSingleComponentFactory) UnoRuntime.queryInterface(
+ XSingleComponentFactory.class, xImpLoader.activate(
+ "com.sun.star.comp.servicemanager.ServiceManager", null, null, null ) );
+
+ // Create an instance of the ServiceManager
+- XMultiComponentFactory xSMgr = UnoRuntime.queryInterface(
++ XMultiComponentFactory xSMgr = (XMultiComponentFactory) UnoRuntime.queryInterface(
+ XMultiComponentFactory.class, smgr_fac.createInstanceWithContext( null ) );
+
+ // post init loader
+- XInitialization xInit = UnoRuntime.queryInterface(
++ XInitialization xInit = (XInitialization) UnoRuntime.queryInterface(
+ XInitialization.class, xImpLoader );
+ Object[] args = new Object [] { xSMgr };
+ xInit.initialize( args );
+@@ -137,12 +137,12 @@ public class Bootstrap {
+ XComponentContext xContext = new ComponentContext( context_entries, null );
+
+ // post init smgr
+- xInit = UnoRuntime.queryInterface(
++ xInit = (XInitialization) UnoRuntime.queryInterface(
+ XInitialization.class, xSMgr );
+ args = new Object [] { null, xContext }; // no registry, default context
+ xInit.initialize( args );
+
+- XSet xSet = UnoRuntime.queryInterface( XSet.class, xSMgr );
++ XSet xSet = (XSet) UnoRuntime.queryInterface( XSet.class, xSMgr );
+ // insert the service manager
+ xSet.insert( smgr_fac );
+ // and basic jurt factories
+@@ -159,7 +159,7 @@ public class Bootstrap {
+ */
+ static public XMultiServiceFactory createSimpleServiceManager() throws Exception
+ {
+- return UnoRuntime.queryInterface(
++ return (XMultiServiceFactory) UnoRuntime.queryInterface(
+ XMultiServiceFactory.class, createInitialComponentContext( null ).getServiceManager() );
+ }
+
+@@ -206,7 +206,7 @@ public class Bootstrap {
+ NativeLibraryLoader.loadLibrary( Bootstrap.class.getClassLoader(), "juh" );
+ m_loaded_juh = true;
+ }
+- return UnoRuntime.queryInterface(
++ return (XComponentContext) UnoRuntime.queryInterface(
+ XComponentContext.class,
+ cppuhelper_bootstrap(
+ ini_file, pairs, Bootstrap.class.getClassLoader() ) );
+@@ -283,7 +283,7 @@ public class Bootstrap {
+ try {
+ // try to connect to office
+ Object context = xUrlResolver.resolve( sConnect );
+- xContext = UnoRuntime.queryInterface(
++ xContext = (XComponentContext) UnoRuntime.queryInterface(
+ XComponentContext.class, context);
+ if ( xContext == null )
+ throw new BootstrapException( "no component context!" );
+--- testtools/com/sun/star/comp/bridge/TestComponentMain.java.old 2009-09-25 00:39:01.000000000 +0200
++++ testtools/com/sun/star/comp/bridge/TestComponentMain.java 2009-10-09 20:30:26.000000000 +0200
+@@ -105,10 +105,10 @@ public class TestComponentMain
+ XComponentContext ctx = com.sun.star.comp.helper.Bootstrap.createInitialComponentContext( null );
+ XMultiComponentFactory smgr = ctx.getServiceManager();
+ XMultiServiceFactory oldsmgr =
+- UnoRuntime.queryInterface( XMultiServiceFactory.class, smgr );
++ (XMultiServiceFactory) UnoRuntime.queryInterface( XMultiServiceFactory.class, smgr );
+
+ // prepare servicemanager
+- XSet set = UnoRuntime.queryInterface(XSet.class, smgr);
++ XSet set = (XSet) UnoRuntime.queryInterface(XSet.class, smgr);
+ Object o = com.sun.star.comp.bridge.TestComponent.__getServiceFactory(
+ "com.sun.star.comp.bridge.TestComponent$_TestObject", oldsmgr,null );
+ set.insert(o);
+@@ -121,7 +121,7 @@ public class TestComponentMain
+
+ XConnection xConnection = xAcceptor.accept(conDcp);
+
+- XBridgeFactory xBridgeFactory = UnoRuntime.queryInterface(
++ XBridgeFactory xBridgeFactory = (XBridgeFactory) UnoRuntime.queryInterface(
+ XBridgeFactory.class,
+ smgr.createInstanceWithContext("com.sun.star.bridge.BridgeFactory",ctx));
+
+@@ -130,7 +130,7 @@ public class TestComponentMain
+
+ if (singleaccept) {
+ Listener listener = new Listener();
+- UnoRuntime.queryInterface(XComponent.class, xBridge).
++ ((XComponent) UnoRuntime.queryInterface(XComponent.class, xBridge)).
+ addEventListener(listener);
+ listener.await();
+ break;
commit c99f70e5bc0164eae7edfddc583bafecc069fbbd
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 12 17:47:56 2009 +0200
Read cairo link flags from pkgconfig (i#105834)
* patches/dev300/cancas-cairo-linkflags.diff:
* patches/dev300/apply: do not hardcode -lpixman-1; read the system cairo
linkflags from pkgconfig; thanks Thorsten for hint (i#105834)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e8ea3cd..13b65eb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1120,6 +1120,9 @@ build-prebuilt-stax.diff, i#93116, pmladek
# accessibility depends on juh.jar
build-accessibility-dep.diff, i#105833, pmladek
+# use the link flags from the pkgconfig when using the system cairo
+cancas-cairo-linkflags.diff, i#105834, pmladek
+
# fix build with neon-0.24
ucb-neon-0.24.diff, pmladek
diff --git a/patches/dev300/cancas-cairo-linkflags.diff b/patches/dev300/cancas-cairo-linkflags.diff
new file mode 100644
index 0000000..f69f67c
--- /dev/null
+++ b/patches/dev300/cancas-cairo-linkflags.diff
@@ -0,0 +1,20 @@
+--- canvas/source/cairo/makefile.mk.old 2009-09-10 19:49:19.000000000 +0200
++++ canvas/source/cairo/makefile.mk 2009-10-05 21:13:42.000000000 +0200
+@@ -91,7 +91,7 @@ SHL1STDLIBS= $(CPPULIB) $(TKLIB) $(SALLI
+ .IF "$(SYSTEM_CAIRO)" == "YES"
+ SHL1STDLIBS+= $(CAIRO_LIBS)
+ .ELSE
+-SHL1STDLIBS+= -lcairo
++SHL1STDLIBS+= -lcairo -lpixman-1
+ .ENDIF
+
+ .IF "$(GUIBASE)"=="aqua"
+@@ -103,7 +103,7 @@ CFLAGSCXX+=$(OBJCXXFLAGS)
+
+ # Xlib
+ SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj
+-SHL1STDLIBS+= -lfontconfig -lX11 -lXrender -lpixman-1 $(FREETYPE_LIBS)
++SHL1STDLIBS+= -lfontconfig -lX11 -lXrender $(FREETYPE_LIBS)
+ CFLAGS+=$(FREETYPE_CFLAGS)
+
+ .ENDIF # "$(GUIBASE)"=="aqua"
commit 6acc914af2644d2e2b7808fe9df68fa6e8df22ab
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 12 17:30:35 2009 +0200
accessibility depends on juh.jar (i#105833)
* patches/dev300/build-accessibility-dep.diff:
* patches/dev300/apply: add missing dependency on javaunohelper (i#105833)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 39e3111..e8ea3cd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1117,6 +1117,9 @@ installer-get-path-correctly.diff, pmladek
# allow to use the prebuilt jsr173_1.0_api.jar
build-prebuilt-stax.diff, i#93116, pmladek
+# accessibility depends on juh.jar
+build-accessibility-dep.diff, i#105833, pmladek
+
# fix build with neon-0.24
ucb-neon-0.24.diff, pmladek
diff --git a/patches/dev300/build-accessibility-dep.diff b/patches/dev300/build-accessibility-dep.diff
new file mode 100644
index 0000000..ddbf6a8
--- /dev/null
+++ b/patches/dev300/build-accessibility-dep.diff
@@ -0,0 +1,8 @@
+--- accessibility/prj/build.lst.old 2009-09-25 00:39:01.000000000 +0200
++++ accessibility/prj/build.lst 2009-10-09 19:14:38.000000000 +0200
+@@ -1,4 +1,4 @@
+-ac accessibility : l10n tools jurt offuh unoil vcl jvmaccess cppu sal toolkit svtools NULL
++ac accessibility : l10n tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools NULL
+ ac accessibility usr1 - all ac_mkout NULL
+ ac accessibility\inc nmake - all ac_inc NULL
+ ac accessibility\bridge\org\openoffice\java\accessibility nmake - w ac_ooja ac_inc NULL
commit c4b326868435e64d9cb8b5ddd4fe2dc6d843add9
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 12 17:19:44 2009 +0200
Update libxmlsec-system-nss.diff for dev300-m60
* patches/dev300/libxmlsec-system-nss.diff:
diff --git a/patches/dev300/libxmlsec-system-nss.diff b/patches/dev300/libxmlsec-system-nss.diff
index 6930188..feb9234 100644
--- a/patches/dev300/libxmlsec-system-nss.diff
+++ b/patches/dev300/libxmlsec-system-nss.diff
@@ -1,2323 +1,40 @@
---- libxmlsec/xmlsec1-1.2.6.patch.old 2008-07-15 11:55:05.000000000 +0200
-+++ libxmlsec/xmlsec1-1.2.6.patch 2008-07-15 16:54:38.000000000 +0200
-@@ -10,210 +10,8 @@
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
- --- misc/xmlsec1-1.2.6/configure 2004-08-26 08:00:34.000000000 +0200
--+++ misc/build/xmlsec1-1.2.6/configure 2008-06-29 23:44:19.000000000 +0200
--@@ -463,7 +463,7 @@
-- # include <unistd.h>
-- #endif"
--
---ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os XMLSEC_VERSION XMLSEC_PACKAGE XMLSEC_VERSION_SAFE XMLSEC_VERSION_MAJOR XMLSEC_VERSION_MINOR XMLSEC_VERSION_SUBMINOR XMLSEC_VERSION_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RM CP MV TAR HELP2MAN MAN2HTML U ANSI2KNR INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL PKG_CONFIG_ENABLED PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS LIBXML262_CFLAGS LIBXML262_LIBS LIBXML_CONFIG LIBXML_MIN_VERSION LIBXSLT_CFLAGS LIBXSLT_LIBS XMLSEC_NO_LIBXSLT LIBXSLT_CONFIG LIBXSLT_MIN_VERSION OPENSSL_CFLAGS OPENSSL_LIBS OPENSSL097_CFLAGS OPENSSL097_LIBS XMLSEC_NO_OPENSSL_TRUE XMLSEC_NO_OPENSSL_FALSE XMLSEC_NO_OPENSSL OPENSSL_CRYPTO_LIB OPENSSL_MIN_VERSION GNUTLS_CFLAGS GNUTLS_LIBS XMLSEC_NO_GNUTLS_TRUE XMLSEC_NO_GNUTLS_FALSE XMLSEC_NO_GNUTLS GNUTLS_CRYPTO_LIB GNUTLS_MIN_VERSION NSS_CFLAGS NSS_LIBS XMLSEC_NO_NSS_TRUE XMLSEC_NO_NSS_FALSE XMLSEC_NO_NSS NSS_CRYPTO_LIB NSS_MIN_VERSION NSPR_MIN_VERSION MOZILLA_MIN_VERSION XMLSEC_NO_SHA1_TRUE XMLSEC_NO_SHA1_FALSE XMLSEC_NO_SHA1 XMLSEC_NO_RIPEMD160_TRUE XMLSEC_NO_RIPEMD160_FALSE XMLSEC_NO_RIPEMD160 XMLSEC_NO_HMAC_TRUE XMLSEC_NO_HMAC_FALSE XMLSEC_NO_HMAC XMLSEC_NO_DSA_TRUE XMLSEC_NO_DSA_FALSE XMLSEC_NO_DSA XMLSEC_NO_RSA_TRUE XMLSEC_NO_RSA_FALSE XMLSEC_NO_RSA XMLSEC_NO_X509_TRUE XMLSEC_NO_X509_FALSE XMLSEC_NO_X509 XMLSEC_NO_DES_TRUE XMLSEC_NO_DES_FALSE XMLSEC_NO_DES XMLSEC_NO_AES_TRUE XMLSEC_NO_AES_FALSE XMLSEC_NO_AES XMLSEC_NO_XMLDSIG_TRUE XMLSEC_NO_XMLDSIG_FALSE XMLSEC_NO_XMLDSIG XMLSEC_NO_XMLENC_TRUE XMLSEC_NO_XMLENC_FALSE XMLSEC_NO_XMLENC XMLSEC_NO_XKMS_TRUE XMLSEC_NO_XKMS_FALSE XMLSEC_NO_XKMS XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE XMLSEC_NO_CRYPTO_DYNAMIC_LOADING XMLSEC_DL_INCLUDES XMLSEC_DL_LIBS XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING XMLSEC_DOCDIR XMLSEC_STATIC_BINARIES XMLSEC_CORE_CFLAGS XMLSEC_CORE_LIBS XMLSEC_LIBDIR XMLSEC_OPENSSL_CFLAGS XMLSEC_OPENSSL_LIBS XMLSEC_GNUTLS_CFLAGS XMLSEC_GNUTLS_LIBS XMLSEC_NSS_CFLAGS XMLSEC_NSS_LIBS XMLSEC_CFLAGS XMLSEC_LIBS XMLSEC_DEFINES XMLSEC_APP_DEFINES XMLSEC_CRYPTO XMLSEC_CRYPTO_LIST XMLSEC_CRYPTO_DISABLED_LIST XMLSEC_CRYPTO_LIB XMLSEC_CRYPTO_CFLAGS XMLSEC_CRYPTO_LIBS XMLSEC_CRYPTO_PC_FILES_LIST LIBOBJS LTLIBOBJS'
--+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os XMLSEC_VERSION XMLSEC_PACKAGE XMLSEC_VERSION_SAFE XMLSEC_VERSION_MAJOR XMLSEC_VERSION_MINOR XMLSEC_VERSION_SUBMINOR XMLSEC_VERSION_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RM CP MV TAR HELP2MAN MAN2HTML U ANSI2KNR INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL PKG_CONFIG_ENABLED PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS LIBXML262_CFLAGS LIBXML262_LIBS LIBXML_CONFIG LIBXML_MIN_VERSION LIBXSLT_CFLAGS LIBXSLT_LIBS XMLSEC_NO_LIBXSLT LIBXSLT_CONFIG LIBXSLT_MIN_VERSION OPENSSL_CFLAGS OPENSSL_LIBS OPENSSL097_CFLAGS OPENSSL097_LIBS XMLSEC_NO_OPENSSL_TRUE XMLSEC_NO_OPENSSL_FALSE XMLSEC_NO_OPENSSL OPENSSL_CRYPTO_LIB OPENSSL_MIN_VERSION GNUTLS_CFLAGS GNUTLS_LIBS XMLSEC_NO_GNUTLS_TRUE XMLSEC_NO_GNUTLS_FALSE XMLSEC_NO_GNUTLS GNUTLS_CRYPTO_LIB GNUTLS_MIN_VERSION NSS_CFLAGS NSS_LIBS XMLSEC_NO_NSS_TRUE XMLSEC_NO_NSS_FALSE XMLSEC_NO_NSS NSS_CRYPTO_LIB NSS_MIN_VERSION NSPR_MIN_VERSION MOZILLA_MIN_VERSION MSCRYPTO_CFLAGS MSCRYPTO_LIBS XMLSEC_NO_SHA1_TRUE XMLSEC_NO_SHA1_FALSE XMLSEC_NO_SHA1 XMLSEC_NO_RIPEMD160_TRUE XMLSEC_NO_RIPEMD160_FALSE XMLSEC_NO_RIPEMD160 XMLSEC_NO_HMAC_TRUE XMLSEC_NO_HMAC_FALSE XMLSEC_NO_HMAC XMLSEC_NO_DSA_TRUE XMLSEC_NO_DSA_FALSE XMLSEC_NO_DSA XMLSEC_NO_RSA_TRUE XMLSEC_NO_RSA_FALSE XMLSEC_NO_RSA XMLSEC_NO_X509_TRUE XMLSEC_NO_X509_FALSE XMLSEC_NO_X509 XMLSEC_NO_DES_TRUE XMLSEC_NO_DES_FALSE XMLSEC_NO_DES XMLSEC_NO_AES_TRUE XMLSEC_NO_AES_FALSE XMLSEC_NO_AES XMLSEC_NO_XMLDSIG_TRUE XMLSEC_NO_XMLDSIG_FALSE XMLSEC_NO_XMLDSIG XMLSEC_NO_XMLENC_TRUE XMLSEC_NO_XMLENC_FALSE XMLSEC_NO_XMLENC XMLSEC_NO_XKMS_TRUE XMLSEC_NO_XKMS_FALSE XMLSEC_NO_XKMS XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE XMLSEC_NO_CRYPTO_DYNAMIC_LOADING XMLSEC_DL_INCLUDES XMLSEC_DL_LIBS XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING XMLSEC_DOCDIR XMLSEC_STATIC_BINARIES XMLSEC_CORE_CFLAGS XMLSEC_CORE_LIBS XMLSEC_LIBDIR XMLSEC_OPENSSL_CFLAGS XMLSEC_OPENSSL_LIBS XMLSEC_GNUTLS_CFLAGS XMLSEC_GNUTLS_LIBS XMLSEC_NSS_CFLAGS XMLSEC_NSS_LIBS XMLSEC_CFLAGS XMLSEC_LIBS XMLSEC_DEFINES XMLSEC_APP_DEFINES XMLSEC_CRYPTO XMLSEC_CRYPTO_LIST XMLSEC_CRYPTO_DISABLED_LIST XMLSEC_CRYPTO_LIB XMLSEC_CRYPTO_CFLAGS XMLSEC_CRYPTO_LIBS XMLSEC_CRYPTO_PC_FILES_LIST LIBOBJS LTLIBOBJS'
-- ac_subst_files=''
--
-- # Initialize some variables set by options.
--@@ -1072,6 +1072,7 @@
-- --with-nss=PFX nss location
-- --with-nspr=PFX nspr location (needed for NSS)
-- --with-mozilla-ver=VER mozilla version (alt to --with-nss, --with-nspr)
--+ --with-mscrypto try to use mscrypto
-- --with-html-dir=PATH path to installed docs
--
-- Some influential environment variables:
--@@ -2045,8 +2046,8 @@
--
-- ac_ext=c
-- ac_cpp='$CPP $CPPFLAGS'
---ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
---ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
--@@ -2698,15 +2699,15 @@
-- CFLAGS=$ac_save_CFLAGS
-- elif test $ac_cv_prog_cc_g = yes; then
-- if test "$GCC" = yes; then
--- CFLAGS="-g -O2"
--+ CFLAGS="$ADDCFLAGS -g -O2"
-- else
--- CFLAGS="-g"
--+ CFLAGS="$ADDCFLAGS -g"
-- fi
-- else
-- if test "$GCC" = yes; then
--- CFLAGS="-O2"
--+ CFLAGS="$ADDCFLAGS -O2"
-- else
--- CFLAGS=
--+ CFLAGS="$ADDCFLAGS"
-- fi
-- fi
-- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--@@ -6350,11 +6351,11 @@
-- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-- ;;
--
--- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--+ beos* | cygwin* | mingw* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
-- ;;
--
--- mingw* | pw32* | os2*)
--+ pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic='-DDLL_EXPORT'
--@@ -6409,7 +6410,7 @@
-- fi
-- ;;
--
--- mingw* | pw32* | os2*)
--+ pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic='-DDLL_EXPORT'
--@@ -6752,7 +6753,7 @@
-- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
--
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--exclude-libs,ALL ${wl}--out-implib,$lib'
-- # If the export-symbols file already is a .def file (1st line
-- # is EXPORTS), use it as is; otherwise, prepend...
-- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--@@ -7778,7 +7779,7 @@
-- ;;
--
-- freebsd*)
--- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
--@@ -9046,7 +9047,7 @@
-- ;;
-- esac
-- output_verbose_link_cmd='echo'
--- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name @executable_path/$soname $verstring'
-- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--@@ -10088,7 +10089,7 @@
-- enable_shared_with_static_runtimes_CXX=yes
--
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--exclude-libs,ALL ${wl}--out-implib,$lib'
-- # If the export-symbols file already is a .def file (1st line
-- # is EXPORTS), use it as is; otherwise, prepend...
-- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--@@ -10816,10 +10817,10 @@
-- # like `-m68040'.
-- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-- ;;
--- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--+ beos* | cygwin* | mingw* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
-- ;;
--- mingw* | os2* | pw32*)
--+ os2* | pw32*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
--@@ -11497,7 +11498,7 @@
-- ;;
--
-- freebsd*)
--- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
--@@ -13259,11 +13260,11 @@
-- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-- ;;
--
--- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--+ beos* | cygwin* | mingw* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
-- ;;
--
--- mingw* | pw32* | os2*)
--+ pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
--@@ -13661,7 +13662,7 @@
-- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
--
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--exclude-libs,ALL ${wl}--out-implib,$lib'
-- # If the export-symbols file already is a .def file (1st line
-- # is EXPORTS), use it as is; otherwise, prepend...
-- archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--@@ -14667,7 +14668,7 @@
-- ;;
--
-- freebsd*)
--- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
--@@ -15607,11 +15608,11 @@
-- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-- ;;
--
--- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--+ beos* | cygwin* | mingw* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
-- ;;
--
--- mingw* | pw32* | os2*)
--+ pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
--@@ -15666,7 +15667,7 @@
-- fi
-- ;;
--
--- mingw* | pw32* | os2*)
--+ pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
--@@ -16009,7 +16010,7 @@
-- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
--
-- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
--+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--exclude-libs,ALL ${wl}--out-implib,$lib'
-- # If the export-symbols file already is a .def file (1st line
-- # is EXPORTS), use it as is; otherwise, prepend...
-- archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--@@ -17035,7 +17036,7 @@
-- ;;
--
-- freebsd*)
--- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
--@@ -24598,7 +24599,7 @@
-++++ misc/build/xmlsec1-1.2.6/configure 2009-02-16 18:38:15.000000000 +0100
-+@@ -24598,7 +24598,7 @@
- fi
-
- LIBXML_MIN_VERSION="2.4.2"
-@@ -222,7 +20,7 @@
- LIBXML_CFLAGS=""
- LIBXML_LIBS=""
- LIBXML_FOUND="no"
--@@ -25678,12 +25679,26 @@
-+@@ -25678,12 +25678,26 @@
-
- XMLSEC_NO_NSS="1"
- MOZILLA_MIN_VERSION="1.4"
-@@ -235,7 +33,7 @@
- NSS_LIBS=""
- -NSS_LIBS_LIST="-lnss3 -lsmime3"
- -NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
--+
-++
- +case $host_os in
- +cygwin* | mingw* | pw32*)
- + NSS_LIBS_LIST="-lnss3 -lsmime3"
-@@ -251,29 +49,29 @@
- NSS_CRYPTO_LIB="$PACKAGE-nss"
- NSS_FOUND="no"
-
--@@ -25766,23 +25781,122 @@
-+@@ -25766,23 +25780,122 @@
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- - echo "$as_me:$LINENO: checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5
- -echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
--+ echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" >&5
--+echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
-++ echo "$as_me:$LINENO: checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" >&5
-++echo $ECHO_N "checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
- +
--+ if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" ; then
-++ if $PKG_CONFIG --exists "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" ; then
- + echo "$as_me:$LINENO: result: yes" >&5
- +echo "${ECHO_T}yes" >&6
- + succeeded=yes
- +
- + echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
- +echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
--+ NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
-++ NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
- + echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
- +echo "${ECHO_T}$NSS_CFLAGS" >&6
- +
- + echo "$as_me:$LINENO: checking NSS_LIBS" >&5
- +echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
--+ NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
-++ NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
- + echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
- +echo "${ECHO_T}$NSS_LIBS" >&6
- + else
-@@ -281,7 +79,7 @@
- + NSS_LIBS=""
- + ## If we have a custom action on failure, don't print errors, but
- + ## do set a variable so people can do so.
--+ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
-++ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
- +
- + fi
- +
-@@ -356,11 +154,11 @@
- + else
- + PKG_CONFIG_MIN_VERSION=0.9.0
- + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--+ echo "$as_me:$LINENO: checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" >&5
--+echo $ECHO_N "checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION... $ECHO_C" >&6
-++ echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION" >&5
-++echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION... $ECHO_C" >&6
-
- - if $PKG_CONFIG --exists "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" ; then
--+ if $PKG_CONFIG --exists "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" ; then
-++ if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION" ; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- succeeded=yes
-@@ -368,27 +166,27 @@
- echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
- echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
- - NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
--+ NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
-++ NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION"`
- echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
- echo "${ECHO_T}$NSS_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking NSS_LIBS" >&5
- echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
- - NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
--+ NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
-++ NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION"`
- echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
- echo "${ECHO_T}$NSS_LIBS" >&6
- else
--@@ -25790,7 +25904,7 @@
-+@@ -25790,7 +25903,7 @@
- NSS_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- - NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION"`
--+ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
-++ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION"`
-
- fi
-
--@@ -25808,6 +25922,9 @@
-+@@ -25808,6 +25921,9 @@
- NSS_FOUND=no
- fi
-
-@@ -398,7 +196,7 @@
- fi
-
- if test "z$NSS_FOUND" = "zno" ; then
--@@ -25817,8 +25934,8 @@
-+@@ -25817,8 +25933,8 @@
- ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
- fi
-
-@@ -409,21 +207,18 @@
-
- echo "$as_me:$LINENO: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5
- echo $ECHO_N "checking for nspr libraries >= $NSPR_MIN_VERSION... $ECHO_C" >&6
--@@ -25853,8 +25970,11 @@
-+@@ -25853,7 +25969,9 @@
- done
-
- for dir in $ac_nss_lib_dir ; do
- - if test -f $dir/libnspr4.so ; then
--- if test "z$dir" = "z/usr/lib" ; then
- + case $host_os in
- + cygwin* | mingw* | pw32*)
- + if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib -o -f $dir/libnspr4.a ; then
--+ # do not add -L/usr/lib because compiler does it anyway
--+ if test "z$dir" = "z/usr/lib" ; then
-+ if test "z$dir" = "z/usr/lib" ; then
- NSPR_LIBS="$NSPR_LIBS_LIST"
- else
-- if test "z$with_gnu_ld" = "zyes" ; then
--@@ -25865,7 +25985,26 @@
-+@@ -25865,7 +25983,25 @@
- fi
- NSPR_LIBS_FOUND="yes"
- break
-@@ -433,8 +228,7 @@
- +
- + *)
- + if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
--+ # do not add -L/usr/lib because compiler does it anyway
--+ if test "z$dir" = "z/usr/lib" ; then
-++ if test "z$dir" = "z/usr/lib" ; then
- + NSPR_LIBS="$NSPR_LIBS_LIST"
- + else
- + if test "z$with_gnu_ld" = "zyes" ; then
-@@ -451,21 +245,18 @@
- done
- fi
-
--@@ -25939,8 +26078,11 @@
-+@@ -25939,7 +26075,9 @@
- done
-
- for dir in $ac_nss_lib_dir ; do
- - if test -f $dir/libnss3.so ; then
--- if test "z$dir" = "z/usr/lib" ; then
- + case $host_os in
- + cygwin* | mingw* | pw32*)
- + if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib -o -f $dir/libnss3.a ; then
--+ # do not add -L/usr/lib because compiler does it anyway
--+ if test "z$dir" = "z/usr/lib" ; then
-+ if test "z$dir" = "z/usr/lib" ; then
- NSS_LIBS="$NSS_LIBS_LIST"
- else
-- if test "z$with_gnu_ld" = "zyes" ; then
--@@ -25951,7 +26093,26 @@
-+@@ -25951,7 +26089,25 @@
- fi
- NSS_LIBS_FOUND="yes"
- break
-@@ -475,8 +266,7 @@
- +
- + *)
- + if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
--+ # do not add -L/usr/lib because compiler does it anyway
--+ if test "z$dir" = "z/usr/lib" ; then
-++ if test "z$dir" = "z/usr/lib" ; then
- + NSS_LIBS="$NSS_LIBS_LIST"
- + else
- + if test "z$with_gnu_ld" = "zyes" ; then
-@@ -493,1901 +283,8 @@
- done
- fi
-
--@@ -26004,6 +26165,12 @@
-- fi
-- fi
--
--+case $host_os in
--+darwin*)
--+ NSS_LIBS="$NSS_LIBS "`"$PERL" "$SOLARENV/bin/macosx-dylib-link-list.pl" $NSS_LIBS`
--+ ;;
--+esac
--+
-- if test "z$NSS_FOUND" = "zyes" ; then
-- XMLSEC_NO_NSS="0"
-- NSS_CFLAGS="$NSS_CFLAGS -DXMLSEC_CRYPTO_NSS=1"
--@@ -26037,6 +26204,109 @@
--
--
--
--+MSCRYPTO_CFLAGS=""
--+MSCRYPTO_LIBS=""
--+MSCRYPTO_FOUND="no"
--+
--+
--+# Check whether --with-mscrypto or --without-mscrypto was given.
--+if test "${with_mscrypto+set}" = set; then
--+ withval="$with_mscrypto"
--+
--+fi;
--+if test "z$with_mscrypto" = "zno" ; then
--+ echo "$as_me:$LINENO: checking for MSCRYPTO libraries" >&5
--+echo $ECHO_N "checking for MSCRYPTO libraries... $ECHO_C" >&6
--+ echo "$as_me:$LINENO: result: no" >&5
--+echo "${ECHO_T}no" >&6
--+ MSCRYPTO_FOUND="without"
--+else
--+ ac_mscrypto_lib_dir="${PSDK_HOME}/lib"
--+ ac_mscrypto_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external/mingw/include ${COMPATH}/include ${COMPATH}/include/w32api"
--+ echo "$as_me:$LINENO: checking for mscrypto libraries" >&5
--+echo $ECHO_N "checking for mscrypto libraries... $ECHO_C" >&6
--+ MSCRYPTO_INCLUDES_FOUND="no"
--+ MSCRYPTO_LIBS_FOUND="no"
--+ WINCRYPT_H=""
--+
--+ for dir in $ac_mscrypto_inc_dir ; do
--+ if test -f $dir/wincrypt.h ; then
--+ MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -I$dir"
--+ MSCRYPTO_INCLUDES_FOUND="yes"
--+ WINCRYPT_H="$dir/wincrypt.h"
--+ break
--+ fi
--+ done
--+
--+ for dir in $ac_mscrypto_lib_dir ; do
--+ if test -f $dir/crypt32.lib ; then
--+ if test "z$with_gnu_ld" = "zyes" ; then
--+ MSCRYPTO_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $dir/crypt32.lib"
--+ else
--+ MSCRYPTO_LIBS="-L$dir $dir/crypt32.lib"
--+ fi
--+ MSCRYPTO_LIBS_FOUND="yes"
--+ break
--+ fi
--+ done
--+
--+ if test "z$MSCRYPTO_INCLUDES_FOUND" = "zyes" -a "z$MSCRYPTO_LIBS_FOUND" = "zyes" ; then
--+ OLD_CPPFLAGS=$CPPFLAGS
--+ CPPFLAGS="$MSCRYPTO_CFLAGS"
--+ cat >conftest.$ac_ext <<_ACEOF
--+/* confdefs.h. */
--+_ACEOF
--+cat confdefs.h >>conftest.$ac_ext
--+cat >>conftest.$ac_ext <<_ACEOF
--+/* end confdefs.h. */
--+
--+ #include <wincrypt.h>
--+ #if defined(_WINCRYPT_H) || defined(__WINCRYPT_H__)
--+ yes
--+ #endif
--+
--+_ACEOF
--+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--+ $EGREP "yes" >/dev/null 2>&1; then
--+
--+ MSCRYPTO_FOUND=yes
--+
--+else
--+
--+ MSCRYPTO_FOUND=no
--+
--+fi
--+rm -f conftest*
--+
--+ CPPFLAGS="$OLD_CPPFLAGS"
--+ fi
--+
--+ if test "z$MSCRYPTO_FOUND" = "zyes" ; then
--+ echo "$as_me:$LINENO: result: yes" >&5
--+echo "${ECHO_T}yes" >&6
--+ else
--+ echo "$as_me:$LINENO: result: no" >&5
--+echo "${ECHO_T}no" >&6
--+ fi
--+
--+fi
--+
--+if test "z$MSCRYPTO_FOUND" = "zyes" ; then
--+ MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1"
--+
--+ if test "z$XMLSEC_CRYPTO" = "z" ; then
--+ XMLSEC_CRYPTO="mscrypto"
--+ XMLSEC_CRYPTO_LIB="$PACKAGE-mscrypto"
--+ XMLSEC_CRYPTO_CFLAGS="$MSCRYPTO_CFLAGS"
--+ XMLSEC_CRYPTO_LIBS="$MSCRYPTO_LIBS"
--+ fi
--+ XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mscrypto"
--+else
--+ XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mscrypto"
--+fi
--+
--+
--+
-- echo "$as_me:$LINENO: checking for crypto library" >&5
-- echo $ECHO_N "checking for crypto library... $ECHO_C" >&6
-- if test "z$XMLSEC_CRYPTO" = "z" ; then
--@@ -26604,7 +26874,7 @@
-- done
--
--
--- ac_config_files="$ac_config_files include/xmlsec/version.h Makefile include/Makefile include/xmlsec/Makefile include/xmlsec/private/Makefile src/Makefile apps/Makefile docs/Makefile docs/api/Makefile man/Makefile xmlsec1Conf.sh:xmlsecConf.sh.in xmlsec1-config:xmlsec-config.in xmlsec1-openssl.pc:xmlsec-openssl.pc.in xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in xmlsec1-nss.pc:xmlsec-nss.pc.in xmlsec1.spec:xmlsec.spec.in"
--+ ac_config_files="$ac_config_files include/xmlsec/version.h Makefile include/Makefile include/xmlsec/Makefile include/xmlsec/private/Makefile src/Makefile apps/Makefile docs/Makefile docs/api/Makefile man/Makefile xmlsec1Conf.sh:xmlsecConf.sh.in xmlsec1-config:xmlsec-config.in xmlsec1-openssl.pc:xmlsec-openssl.pc.in xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in xmlsec1-nss.pc:xmlsec-nss.pc.in xmlsec1-mscrypto.pc:xmlsec-mscrypto.pc.in xmlsec1.spec:xmlsec.spec.in"
-- cat >confcache <<\_ACEOF
-- # This file is a shell script that caches the results of configure
-- # tests run on this system so they can be shared between configure
--@@ -27521,6 +27791,8 @@
-- s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-- s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-- s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
--+s, at MSCRYPTO_CFLAGS@,$MSCRYPTO_CFLAGS,;t t
--+s, at MSCRYPTO_LIBS@,$MSCRYPTO_LIBS,;t t
-- s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
-- s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
-- s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
--@@ -29231,6 +29503,8 @@
-- s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-- s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-- s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
--+s, at MSCRYPTO_CFLAGS@,$MSCRYPTO_CFLAGS,;t t
--+s, at MSCRYPTO_LIBS@,$MSCRYPTO_LIBS,;t t
-- s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
-- s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
-- s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
--@@ -30941,6 +31215,8 @@
-- s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-- s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-- s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
--+s, at MSCRYPTO_CFLAGS@,$MSCRYPTO_CFLAGS,;t t
--+s, at MSCRYPTO_LIBS@,$MSCRYPTO_LIBS,;t t
-- s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
-- s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
-- s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
--@@ -32653,6 +32929,1724 @@
-- s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-- s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-- s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
--+s, at MSCRYPTO_CFLAGS@,$MSCRYPTO_CFLAGS,;t t
--+s, at MSCRYPTO_LIBS@,$MSCRYPTO_LIBS,;t t
--+s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
--+s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
--+s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
--+s, at XMLSEC_NO_RIPEMD160_TRUE@,$XMLSEC_NO_RIPEMD160_TRUE,;t t
--+s, at XMLSEC_NO_RIPEMD160_FALSE@,$XMLSEC_NO_RIPEMD160_FALSE,;t t
--+s, at XMLSEC_NO_RIPEMD160@,$XMLSEC_NO_RIPEMD160,;t t
--+s, at XMLSEC_NO_HMAC_TRUE@,$XMLSEC_NO_HMAC_TRUE,;t t
--+s, at XMLSEC_NO_HMAC_FALSE@,$XMLSEC_NO_HMAC_FALSE,;t t
--+s, at XMLSEC_NO_HMAC@,$XMLSEC_NO_HMAC,;t t
--+s, at XMLSEC_NO_DSA_TRUE@,$XMLSEC_NO_DSA_TRUE,;t t
--+s, at XMLSEC_NO_DSA_FALSE@,$XMLSEC_NO_DSA_FALSE,;t t
--+s, at XMLSEC_NO_DSA@,$XMLSEC_NO_DSA,;t t
--+s, at XMLSEC_NO_RSA_TRUE@,$XMLSEC_NO_RSA_TRUE,;t t
--+s, at XMLSEC_NO_RSA_FALSE@,$XMLSEC_NO_RSA_FALSE,;t t
--+s, at XMLSEC_NO_RSA@,$XMLSEC_NO_RSA,;t t
--+s, at XMLSEC_NO_X509_TRUE@,$XMLSEC_NO_X509_TRUE,;t t
--+s, at XMLSEC_NO_X509_FALSE@,$XMLSEC_NO_X509_FALSE,;t t
--+s, at XMLSEC_NO_X509@,$XMLSEC_NO_X509,;t t
--+s, at XMLSEC_NO_DES_TRUE@,$XMLSEC_NO_DES_TRUE,;t t
--+s, at XMLSEC_NO_DES_FALSE@,$XMLSEC_NO_DES_FALSE,;t t
--+s, at XMLSEC_NO_DES@,$XMLSEC_NO_DES,;t t
--+s, at XMLSEC_NO_AES_TRUE@,$XMLSEC_NO_AES_TRUE,;t t
--+s, at XMLSEC_NO_AES_FALSE@,$XMLSEC_NO_AES_FALSE,;t t
--+s, at XMLSEC_NO_AES@,$XMLSEC_NO_AES,;t t
--+s, at XMLSEC_NO_XMLDSIG_TRUE@,$XMLSEC_NO_XMLDSIG_TRUE,;t t
--+s, at XMLSEC_NO_XMLDSIG_FALSE@,$XMLSEC_NO_XMLDSIG_FALSE,;t t
--+s, at XMLSEC_NO_XMLDSIG@,$XMLSEC_NO_XMLDSIG,;t t
--+s, at XMLSEC_NO_XMLENC_TRUE@,$XMLSEC_NO_XMLENC_TRUE,;t t
--+s, at XMLSEC_NO_XMLENC_FALSE@,$XMLSEC_NO_XMLENC_FALSE,;t t
--+s, at XMLSEC_NO_XMLENC@,$XMLSEC_NO_XMLENC,;t t
--+s, at XMLSEC_NO_XKMS_TRUE@,$XMLSEC_NO_XKMS_TRUE,;t t
--+s, at XMLSEC_NO_XKMS_FALSE@,$XMLSEC_NO_XKMS_FALSE,;t t
--+s, at XMLSEC_NO_XKMS@,$XMLSEC_NO_XKMS,;t t
--+s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
--+s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
--+s, at XMLSEC_NO_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING,;t t
--+s, at XMLSEC_DL_INCLUDES@,$XMLSEC_DL_INCLUDES,;t t
--+s, at XMLSEC_DL_LIBS@,$XMLSEC_DL_LIBS,;t t
--+s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE,;t t
--+s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE,;t t
--+s, at XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING@,$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING,;t t
--+s, at XMLSEC_DOCDIR@,$XMLSEC_DOCDIR,;t t
--+s, at XMLSEC_STATIC_BINARIES@,$XMLSEC_STATIC_BINARIES,;t t
--+s, at XMLSEC_CORE_CFLAGS@,$XMLSEC_CORE_CFLAGS,;t t
--+s, at XMLSEC_CORE_LIBS@,$XMLSEC_CORE_LIBS,;t t
--+s, at XMLSEC_LIBDIR@,$XMLSEC_LIBDIR,;t t
--+s, at XMLSEC_OPENSSL_CFLAGS@,$XMLSEC_OPENSSL_CFLAGS,;t t
--+s, at XMLSEC_OPENSSL_LIBS@,$XMLSEC_OPENSSL_LIBS,;t t
--+s, at XMLSEC_GNUTLS_CFLAGS@,$XMLSEC_GNUTLS_CFLAGS,;t t
--+s, at XMLSEC_GNUTLS_LIBS@,$XMLSEC_GNUTLS_LIBS,;t t
--+s, at XMLSEC_NSS_CFLAGS@,$XMLSEC_NSS_CFLAGS,;t t
--+s, at XMLSEC_NSS_LIBS@,$XMLSEC_NSS_LIBS,;t t
--+s, at XMLSEC_CFLAGS@,$XMLSEC_CFLAGS,;t t
--+s, at XMLSEC_LIBS@,$XMLSEC_LIBS,;t t
--+s, at XMLSEC_DEFINES@,$XMLSEC_DEFINES,;t t
--+s, at XMLSEC_APP_DEFINES@,$XMLSEC_APP_DEFINES,;t t
--+s, at XMLSEC_CRYPTO@,$XMLSEC_CRYPTO,;t t
--+s, at XMLSEC_CRYPTO_LIST@,$XMLSEC_CRYPTO_LIST,;t t
--+s, at XMLSEC_CRYPTO_DISABLED_LIST@,$XMLSEC_CRYPTO_DISABLED_LIST,;t t
--+s, at XMLSEC_CRYPTO_LIB@,$XMLSEC_CRYPTO_LIB,;t t
--+s, at XMLSEC_CRYPTO_CFLAGS@,$XMLSEC_CRYPTO_CFLAGS,;t t
--+s, at XMLSEC_CRYPTO_LIBS@,$XMLSEC_CRYPTO_LIBS,;t t
--+s, at XMLSEC_CRYPTO_PC_FILES_LIST@,$XMLSEC_CRYPTO_PC_FILES_LIST,;t t
--+s, at LIBOBJS@,$LIBOBJS,;t t
--+s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--+CEOF
--+
--+_ACEOF
--+
--+ cat >>$CONFIG_STATUS <<\_ACEOF
--+ # Split the substitutions into bite-sized pieces for seds with
--+ # small command number limits, like on Digital OSF/1 and HP-UX.
--+ ac_max_sed_lines=48
--+ ac_sed_frag=1 # Number of current file.
--+ ac_beg=1 # First line for current file.
--+ ac_end=$ac_max_sed_lines # Line after last line for current file.
--+ ac_more_lines=:
--+ ac_sed_cmds=
--+ while $ac_more_lines; do
--+ if test $ac_beg -gt 1; then
--+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--+ else
--+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--+ fi
--+ if test ! -s $tmp/subs.frag; then
--+ ac_more_lines=false
--+ else
--+ # The purpose of the label and of the branching condition is to
--+ # speed up the sed processing (if there are no `@' at all, there
--+ # is no need to browse any of the substitutions).
--+ # These are the two extra sed commands mentioned above.
--+ (echo ':t
--+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
--+ if test -z "$ac_sed_cmds"; then
--+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
--+ else
--+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
--+ fi
--+ ac_sed_frag=`expr $ac_sed_frag + 1`
--+ ac_beg=$ac_end
--+ ac_end=`expr $ac_end + $ac_max_sed_lines`
--+ fi
--+ done
--+ if test -z "$ac_sed_cmds"; then
--+ ac_sed_cmds=cat
--+ fi
--+fi # test -n "$CONFIG_FILES"
--+
--+_ACEOF
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
--+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--+ case $ac_file in
--+ - | *:- | *:-:* ) # input from stdin
--+ cat >$tmp/stdin
--+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--+ * ) ac_file_in=$ac_file.in ;;
--+ esac
--+
--+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X"$ac_file" : 'X\(//\)[^/]' \| \
--+ X"$ac_file" : 'X\(//\)$' \| \
--+ X"$ac_file" : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X"$ac_file" |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+ { if $as_mkdir_p; then
--+ mkdir -p "$ac_dir"
--+ else
--+ as_dir="$ac_dir"
--+ as_dirs=
--+ while test ! -d "$as_dir"; do
--+ as_dirs="$as_dir $as_dirs"
--+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
--+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X"$as_dir" : 'X\(//\)[^/]' \| \
--+ X"$as_dir" : 'X\(//\)$' \| \
--+ X"$as_dir" : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X"$as_dir" |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+ done
--+ test ! -n "$as_dirs" || mkdir $as_dirs
--+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--+ { (exit 1); exit 1; }; }; }
--+
--+ ac_builddir=.
--+
--+if test "$ac_dir" != .; then
--+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--+ # A "../" for each directory in $ac_dir_suffix.
--+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--+else
--+ ac_dir_suffix= ac_top_builddir=
--+fi
--+
--+case $srcdir in
--+ .) # No --srcdir option. We are building in place.
--+ ac_srcdir=.
--+ if test -z "$ac_top_builddir"; then
--+ ac_top_srcdir=.
--+ else
--+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--+ fi ;;
--+ [\\/]* | ?:[\\/]* ) # Absolute path.
--+ ac_srcdir=$srcdir$ac_dir_suffix;
--+ ac_top_srcdir=$srcdir ;;
--+ *) # Relative path.
--+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
--+esac
--+
--+# Do not use `cd foo && pwd` to compute absolute paths, because
--+# the directories may not exist.
--+case `pwd` in
--+.) ac_abs_builddir="$ac_dir";;
--+*)
--+ case "$ac_dir" in
--+ .) ac_abs_builddir=`pwd`;;
--+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
--+ esac;;
--+esac
--+case $ac_abs_builddir in
--+.) ac_abs_top_builddir=${ac_top_builddir}.;;
--+*)
--+ case ${ac_top_builddir}. in
--+ .) ac_abs_top_builddir=$ac_abs_builddir;;
--+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--+ esac;;
--+esac
--+case $ac_abs_builddir in
--+.) ac_abs_srcdir=$ac_srcdir;;
--+*)
--+ case $ac_srcdir in
--+ .) ac_abs_srcdir=$ac_abs_builddir;;
--+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--+ esac;;
--+esac
--+case $ac_abs_builddir in
--+.) ac_abs_top_srcdir=$ac_top_srcdir;;
--+*)
--+ case $ac_top_srcdir in
--+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
--+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--+ esac;;
--+esac
--+
--+
--+ case $INSTALL in
--+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
--+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
--+ esac
--+
--+ if test x"$ac_file" != x-; then
--+ { echo "$as_me:$LINENO: creating $ac_file" >&5
--+echo "$as_me: creating $ac_file" >&6;}
--+ rm -f "$ac_file"
--+ fi
--+ # Let's still pretend it is `configure' which instantiates (i.e., don't
--+ # use $as_me), people would be surprised to read:
--+ # /* config.h. Generated by config.status. */
--+ if test x"$ac_file" = x-; then
--+ configure_input=
--+ else
--+ configure_input="$ac_file. "
--+ fi
--+ configure_input=$configure_input"Generated from `echo $ac_file_in |
--+ sed 's,.*/,,'` by configure."
--+
--+ # First look for the input files in the build tree, otherwise in the
--+ # src tree.
--+ ac_file_inputs=`IFS=:
--+ for f in $ac_file_in; do
--+ case $f in
--+ -) echo $tmp/stdin ;;
--+ [\\/$]*)
--+ # Absolute (can't be DOS-style, as IFS=:)
--+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--+echo "$as_me: error: cannot find input file: $f" >&2;}
--+ { (exit 1); exit 1; }; }
--+ echo "$f";;
--+ *) # Relative
--+ if test -f "$f"; then
--+ # Build tree
--+ echo "$f"
--+ elif test -f "$srcdir/$f"; then
--+ # Source tree
--+ echo "$srcdir/$f"
--+ else
--+ # /dev/null tree
--+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--+echo "$as_me: error: cannot find input file: $f" >&2;}
--+ { (exit 1); exit 1; }; }
--+ fi;;
--+ esac
--+ done` || { (exit 1); exit 1; }
--+_ACEOF
--+cat >>$CONFIG_STATUS <<_ACEOF
--+ sed "$ac_vpsub
--+$extrasub
--+_ACEOF
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+:t
--+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--+s, at configure_input@,$configure_input,;t t
--+s, at srcdir@,$ac_srcdir,;t t
--+s, at abs_srcdir@,$ac_abs_srcdir,;t t
--+s, at top_srcdir@,$ac_top_srcdir,;t t
--+s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--+s, at builddir@,$ac_builddir,;t t
--+s, at abs_builddir@,$ac_abs_builddir,;t t
--+s, at top_builddir@,$ac_top_builddir,;t t
--+s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--+s, at INSTALL@,$ac_INSTALL,;t t
--+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
--+ rm -f $tmp/stdin
--+ if test x"$ac_file" != x-; then
--+ mv $tmp/out $ac_file
--+ else
--+ cat $tmp/out
--+ rm -f $tmp/out
--+ fi
--+
--+done
--+_ACEOF
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+
--+#
--+# CONFIG_HEADER section.
--+#
--+
--+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--+# NAME is the cpp macro being defined and VALUE is the value it is being given.
--+#
--+# ac_d sets the value in "#define NAME VALUE" lines.
--+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--+ac_dB='[ ].*$,\1#\2'
--+ac_dC=' '
--+ac_dD=',;t'
--+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--+ac_uB='$,\1#\2define\3'
--+ac_uC=' '
--+ac_uD=',;t'
--+
--+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
--+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--+ case $ac_file in
--+ - | *:- | *:-:* ) # input from stdin
--+ cat >$tmp/stdin
--+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--+ * ) ac_file_in=$ac_file.in ;;
--+ esac
--+
--+ test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--+echo "$as_me: creating $ac_file" >&6;}
--+
--+ # First look for the input files in the build tree, otherwise in the
--+ # src tree.
--+ ac_file_inputs=`IFS=:
--+ for f in $ac_file_in; do
--+ case $f in
--+ -) echo $tmp/stdin ;;
--+ [\\/$]*)
--+ # Absolute (can't be DOS-style, as IFS=:)
--+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--+echo "$as_me: error: cannot find input file: $f" >&2;}
--+ { (exit 1); exit 1; }; }
--+ # Do quote $f, to prevent DOS paths from being IFS'd.
--+ echo "$f";;
--+ *) # Relative
--+ if test -f "$f"; then
--+ # Build tree
--+ echo "$f"
--+ elif test -f "$srcdir/$f"; then
--+ # Source tree
--+ echo "$srcdir/$f"
--+ else
--+ # /dev/null tree
--+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--+echo "$as_me: error: cannot find input file: $f" >&2;}
--+ { (exit 1); exit 1; }; }
--+ fi;;
--+ esac
--+ done` || { (exit 1); exit 1; }
--+ # Remove the trailing spaces.
--+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
--+
--+_ACEOF
--+
--+# Transform confdefs.h into two sed scripts, `conftest.defines' and
--+# `conftest.undefs', that substitutes the proper values into
--+# config.h.in to produce config.h. The first handles `#define'
--+# templates, and the second `#undef' templates.
--+# And first: Protect against being on the right side of a sed subst in
--+# config.status. Protect against being in an unquoted here document
--+# in config.status.
--+rm -f conftest.defines conftest.undefs
--+# Using a here document instead of a string reduces the quoting nightmare.
--+# Putting comments in sed scripts is not portable.
--+#
--+# `end' is used to avoid that the second main sed command (meant for
--+# 0-ary CPP macros) applies to n-ary macro definitions.
--+# See the Autoconf documentation for `clear'.
--+cat >confdef2sed.sed <<\_ACEOF
--+s/[\\&,]/\\&/g
--+s,[\\$`],\\&,g
--+t clear
--+: clear
--+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--+t end
--+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--+: end
--+_ACEOF
--+# If some macros were called several times there might be several times
--+# the same #defines, which is useless. Nevertheless, we may not want to
--+# sort them, since we want the *last* AC-DEFINE to be honored.
--+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--+rm -f confdef2sed.sed
--+
--+# This sed command replaces #undef with comments. This is necessary, for
--+# example, in the case of _POSIX_SOURCE, which is predefined and required
--+# on some systems where configure will not decide to define it.
--+cat >>conftest.undefs <<\_ACEOF
--+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--+_ACEOF
--+
--+# Break up conftest.defines because some shells have a limit on the size
--+# of here documents, and old seds have small limits too (100 cmds).
--+echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--+echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--+echo ' :' >>$CONFIG_STATUS
--+rm -f conftest.tail
--+while grep . conftest.defines >/dev/null
--+do
--+ # Write a limited-size here document to $tmp/defines.sed.
--+ echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
--+ # Speed up: don't consider the non `#define' lines.
--+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
--+ # Work around the forget-to-reset-the-flag bug.
--+ echo 't clr' >>$CONFIG_STATUS
--+ echo ': clr' >>$CONFIG_STATUS
--+ sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
--+ echo 'CEOF
--+ sed -f $tmp/defines.sed $tmp/in >$tmp/out
--+ rm -f $tmp/in
--+ mv $tmp/out $tmp/in
--+' >>$CONFIG_STATUS
--+ sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
--+ rm -f conftest.defines
--+ mv conftest.tail conftest.defines
--+done
--+rm -f conftest.defines
--+echo ' fi # grep' >>$CONFIG_STATUS
--+echo >>$CONFIG_STATUS
--+
--+# Break up conftest.undefs because some shells have a limit on the size
--+# of here documents, and old seds have small limits too (100 cmds).
--+echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
--+rm -f conftest.tail
--+while grep . conftest.undefs >/dev/null
--+do
--+ # Write a limited-size here document to $tmp/undefs.sed.
--+ echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
--+ # Speed up: don't consider the non `#undef'
--+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
--+ # Work around the forget-to-reset-the-flag bug.
--+ echo 't clr' >>$CONFIG_STATUS
--+ echo ': clr' >>$CONFIG_STATUS
--+ sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
--+ echo 'CEOF
--+ sed -f $tmp/undefs.sed $tmp/in >$tmp/out
--+ rm -f $tmp/in
--+ mv $tmp/out $tmp/in
--+' >>$CONFIG_STATUS
--+ sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
--+ rm -f conftest.undefs
--+ mv conftest.tail conftest.undefs
--+done
--+rm -f conftest.undefs
--+
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+ # Let's still pretend it is `configure' which instantiates (i.e., don't
--+ # use $as_me), people would be surprised to read:
--+ # /* config.h. Generated by config.status. */
--+ if test x"$ac_file" = x-; then
--+ echo "/* Generated by configure. */" >$tmp/config.h
--+ else
--+ echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
--+ fi
--+ cat $tmp/in >>$tmp/config.h
--+ rm -f $tmp/in
--+ if test x"$ac_file" != x-; then
--+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
--+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
--+echo "$as_me: $ac_file is unchanged" >&6;}
--+ else
--+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X"$ac_file" : 'X\(//\)[^/]' \| \
--+ X"$ac_file" : 'X\(//\)$' \| \
--+ X"$ac_file" : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X"$ac_file" |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+ { if $as_mkdir_p; then
--+ mkdir -p "$ac_dir"
--+ else
--+ as_dir="$ac_dir"
--+ as_dirs=
--+ while test ! -d "$as_dir"; do
--+ as_dirs="$as_dir $as_dirs"
--+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
--+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X"$as_dir" : 'X\(//\)[^/]' \| \
--+ X"$as_dir" : 'X\(//\)$' \| \
--+ X"$as_dir" : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X"$as_dir" |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+ done
--+ test ! -n "$as_dirs" || mkdir $as_dirs
--+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--+ { (exit 1); exit 1; }; }; }
--+
--+ rm -f $ac_file
--+ mv $tmp/config.h $ac_file
--+ fi
--+ else
--+ cat $tmp/config.h
--+ rm -f $tmp/config.h
--+ fi
--+# Compute $ac_file's index in $config_headers.
--+_am_stamp_count=1
--+for _am_header in $config_headers :; do
--+ case $_am_header in
--+ $ac_file | $ac_file:* )
--+ break ;;
--+ * )
--+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
--+ esac
--+done
--+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
--+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X$ac_file : 'X\(//\)[^/]' \| \
--+ X$ac_file : 'X\(//\)$' \| \
--+ X$ac_file : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X$ac_file |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`/stamp-h$_am_stamp_count
--+done
--+_ACEOF
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+
--+#
--+# CONFIG_COMMANDS section.
--+#
--+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
--+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
--+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
--+ ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X"$ac_dest" : 'X\(//\)[^/]' \| \
--+ X"$ac_dest" : 'X\(//\)$' \| \
--+ X"$ac_dest" : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X"$ac_dest" |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+ { if $as_mkdir_p; then
--+ mkdir -p "$ac_dir"
--+ else
--+ as_dir="$ac_dir"
--+ as_dirs=
--+ while test ! -d "$as_dir"; do
--+ as_dirs="$as_dir $as_dirs"
--+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
--+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X"$as_dir" : 'X\(//\)[^/]' \| \
--+ X"$as_dir" : 'X\(//\)$' \| \
--+ X"$as_dir" : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X"$as_dir" |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+ done
--+ test ! -n "$as_dirs" || mkdir $as_dirs
--+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--+ { (exit 1); exit 1; }; }; }
--+
--+ ac_builddir=.
--+
--+if test "$ac_dir" != .; then
--+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--+ # A "../" for each directory in $ac_dir_suffix.
--+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--+else
--+ ac_dir_suffix= ac_top_builddir=
--+fi
--+
--+case $srcdir in
--+ .) # No --srcdir option. We are building in place.
--+ ac_srcdir=.
--+ if test -z "$ac_top_builddir"; then
--+ ac_top_srcdir=.
--+ else
--+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--+ fi ;;
--+ [\\/]* | ?:[\\/]* ) # Absolute path.
--+ ac_srcdir=$srcdir$ac_dir_suffix;
--+ ac_top_srcdir=$srcdir ;;
--+ *) # Relative path.
--+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
--+esac
--+
--+# Do not use `cd foo && pwd` to compute absolute paths, because
--+# the directories may not exist.
--+case `pwd` in
--+.) ac_abs_builddir="$ac_dir";;
--+*)
--+ case "$ac_dir" in
--+ .) ac_abs_builddir=`pwd`;;
--+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
--+ esac;;
--+esac
--+case $ac_abs_builddir in
--+.) ac_abs_top_builddir=${ac_top_builddir}.;;
--+*)
--+ case ${ac_top_builddir}. in
--+ .) ac_abs_top_builddir=$ac_abs_builddir;;
--+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--+ esac;;
--+esac
--+case $ac_abs_builddir in
--+.) ac_abs_srcdir=$ac_srcdir;;
--+*)
--+ case $ac_srcdir in
--+ .) ac_abs_srcdir=$ac_abs_builddir;;
--+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--+ esac;;
--+esac
--+case $ac_abs_builddir in
--+.) ac_abs_top_srcdir=$ac_top_srcdir;;
--+*)
--+ case $ac_top_srcdir in
--+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
--+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--+ esac;;
--+esac
--+
--+
--+ { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--+echo "$as_me: executing $ac_dest commands" >&6;}
--+ case $ac_dest in
--+ depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
--+ # Strip MF so we end up with the name of the file.
--+ mf=`echo "$mf" | sed -e 's/:.*$//'`
--+ # Check whether this is an Automake generated Makefile or not.
--+ # We used to match only the files named `Makefile.in', but
--+ # some people rename them; so instead we look at the file content.
--+ # Grep'ing the first line is not enough: some people post-process
--+ # each Makefile.in and add a new line on top of each file to say so.
--+ # So let's grep whole file.
--+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
--+ dirpart=`(dirname "$mf") 2>/dev/null ||
--+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X"$mf" : 'X\(//\)[^/]' \| \
--+ X"$mf" : 'X\(//\)$' \| \
--+ X"$mf" : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X"$mf" |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+ else
--+ continue
--+ fi
--+ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
--+ # Extract the definition of DEP_FILES from the Makefile without
--+ # running `make'.
--+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--+ test -z "$DEPDIR" && continue
--+ # When using ansi2knr, U may be empty or an underscore; expand it
--+ U=`sed -n 's/^U = //p' < "$mf"`
--+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
--+ # We invoke sed twice because it is the simplest approach to
--+ # changing $(DEPDIR) to its actual value in the expansion.
--+ for file in `sed -n '
--+ /^DEP_FILES = .*\\\\$/ {
--+ s/^DEP_FILES = //
--+ :loop
--+ s/\\\\$//
--+ p
--+ n
--+ /\\\\$/ b loop
--+ p
--+ }
--+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
--+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--+ # Make sure the directory exists.
--+ test -f "$dirpart/$file" && continue
--+ fdir=`(dirname "$file") 2>/dev/null ||
--+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X"$file" : 'X\(//\)[^/]' \| \
--+ X"$file" : 'X\(//\)$' \| \
--+ X"$file" : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X"$file" |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+ { if $as_mkdir_p; then
--+ mkdir -p $dirpart/$fdir
--+ else
--+ as_dir=$dirpart/$fdir
--+ as_dirs=
--+ while test ! -d "$as_dir"; do
--+ as_dirs="$as_dir $as_dirs"
--+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
--+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--+ X"$as_dir" : 'X\(//\)[^/]' \| \
--+ X"$as_dir" : 'X\(//\)$' \| \
--+ X"$as_dir" : 'X\(/\)' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X"$as_dir" |
--+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--+ /^X\(\/\/\)$/{ s//\1/; q; }
--+ /^X\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+ done
--+ test ! -n "$as_dirs" || mkdir $as_dirs
--+ fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
--+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
--+ { (exit 1); exit 1; }; }; }
--+
--+ # echo "creating $dirpart/$file"
--+ echo '# dummy' > "$dirpart/$file"
--+ done
--+done
--+ ;;
--+ esac
--+done
--+_ACEOF
--+
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+
--+{ (exit 0); exit 0; }
--+_ACEOF
--+chmod +x $CONFIG_STATUS
--+ac_clean_files=$ac_clean_files_save
--+
--+
--+# configure is writing to config.log, and then calls config.status.
--+# config.status does its own redirection, appending to config.log.
--+# Unfortunately, on DOS this fails, as config.log is still kept open
--+# by configure, so config.status won't be able to write to it; its
--+# output is simply discarded. So we exec the FD to /dev/null,
--+# effectively closing config.log, so it can be properly (re)opened and
--+# appended to by config.status. When coming back to configure, we
--+# need to make the FD available again.
--+if test "$no_create" != yes; then
--+ ac_cs_success=:
--+ ac_config_status_args=
--+ test "$silent" = yes &&
--+ ac_config_status_args="$ac_config_status_args --quiet"
--+ exec 5>/dev/null
--+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
--+ exec 5>>config.log
--+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
--+ # would make configure fail if this is the last instruction.
--+ $ac_cs_success || { (exit 1); exit 1; }
--+fi
--+
--+fi
--+
--+if test "z$MSCRYPTO_FOUND" = "zyes" ; then
--+ ac_config_files="$ac_config_files include/xmlsec/mscrypto/Makefile src/mscrypto/Makefile"
--+cat >confcache <<\_ACEOF
--+# This file is a shell script that caches the results of configure
--+# tests run on this system so they can be shared between configure
--+# scripts and configure runs, see configure's option --config-cache.
--+# It is not useful on other systems. If it contains results you don't
--+# want to keep, you may remove or edit it.
--+#
--+# config.status only pays attention to the cache file if you give it
--+# the --recheck option to rerun configure.
--+#
--+# `ac_cv_env_foo' variables (set or unset) will be overridden when
--+# loading this file, other *unset* `ac_cv_foo' will be assigned the
--+# following values.
--+
--+_ACEOF
--+
--+# The following way of writing the cache mishandles newlines in values,
--+# but we know of no workaround that is simple, portable, and efficient.
--+# So, don't put newlines in cache variables' values.
--+# Ultrix sh set writes to stderr and can't be redirected directly,
--+# and sets the high bit in the cache file unless we assign to the vars.
--+{
--+ (set) 2>&1 |
--+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
--+ *ac_space=\ *)
--+ # `set' does not quote correctly, so add quotes (double-quote
--+ # substitution turns \\\\ into \\, and sed turns \\ into \).
--+ sed -n \
--+ "s/'/'\\\\''/g;
--+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--+ ;;
--+ *)
--+ # `set' quotes correctly as required by POSIX, so do not add quotes.
--+ sed -n \
--+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--+ ;;
--+ esac;
--+} |
--+ sed '
--+ t clear
--+ : clear
--+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--+ t end
--+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--+ : end' >>confcache
--+if diff $cache_file confcache >/dev/null 2>&1; then :; else
--+ if test -w $cache_file; then
--+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--+ cat confcache >$cache_file
--+ else
--+ echo "not updating unwritable cache $cache_file"
--+ fi
--+fi
--+rm -f confcache
--+
--+test "x$prefix" = xNONE && prefix=$ac_default_prefix
--+# Let make expand exec_prefix.
--+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--+
--+# VPATH may cause trouble with some makes, so we remove $(srcdir),
--+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--+# trailing colons and then remove the whole line if VPATH becomes empty
--+# (actually we leave an empty line to preserve line numbers).
--+if test "x$srcdir" = x.; then
--+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
--+s/:*\$(srcdir):*/:/;
--+s/:*\${srcdir}:*/:/;
--+s/:*@srcdir@:*/:/;
--+s/^\([^=]*=[ ]*\):*/\1/;
--+s/:*$//;
--+s/^[^=]*=[ ]*$//;
--+}'
--+fi
--+
--+DEFS=-DHAVE_CONFIG_H
--+
--+ac_libobjs=
--+ac_ltlibobjs=
--+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
--+ # 1. Remove the extension, and $U if already installed.
--+ ac_i=`echo "$ac_i" |
--+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
--+ # 2. Add them.
--+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
--+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
--+done
--+LIBOBJS=$ac_libobjs
--+
--+LTLIBOBJS=$ac_ltlibobjs
--+
--+
--+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"AMDEP\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_OPENSSL_TRUE}" && test -z "${XMLSEC_NO_OPENSSL_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_OPENSSL\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_GNUTLS_TRUE}" && test -z "${XMLSEC_NO_GNUTLS_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_GNUTLS\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_NSS_TRUE}" && test -z "${XMLSEC_NO_NSS_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_NSS\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_NSS\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_SHA1_TRUE}" && test -z "${XMLSEC_NO_SHA1_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_SHA1\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_RIPEMD160_TRUE}" && test -z "${XMLSEC_NO_RIPEMD160_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_RIPEMD160\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_HMAC_TRUE}" && test -z "${XMLSEC_NO_HMAC_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_HMAC\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_DSA_TRUE}" && test -z "${XMLSEC_NO_DSA_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DSA\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_DSA\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_RSA_TRUE}" && test -z "${XMLSEC_NO_RSA_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_RSA\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_RSA\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_X509_TRUE}" && test -z "${XMLSEC_NO_X509_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_X509\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_X509\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_DES_TRUE}" && test -z "${XMLSEC_NO_DES_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_DES\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_DES\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_AES_TRUE}" && test -z "${XMLSEC_NO_AES_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_AES\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_AES\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_XMLDSIG_TRUE}" && test -z "${XMLSEC_NO_XMLDSIG_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_XMLDSIG\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_XMLENC_TRUE}" && test -z "${XMLSEC_NO_XMLENC_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_XMLENC\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_XKMS_TRUE}" && test -z "${XMLSEC_NO_XKMS_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_XKMS\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_CRYPTO_DYNAMIC_LOADING\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+if test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE}" && test -z "${XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE}"; then
--+ { { echo "$as_me:$LINENO: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&5
--+echo "$as_me: error: conditional \"XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING\" was never defined.
--+Usually this means the macro was only invoked conditionally." >&2;}
--+ { (exit 1); exit 1; }; }
--+fi
--+
--+: ${CONFIG_STATUS=./config.status}
--+ac_clean_files_save=$ac_clean_files
--+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--+echo "$as_me: creating $CONFIG_STATUS" >&6;}
--+cat >$CONFIG_STATUS <<_ACEOF
--+#! $SHELL
--+# Generated by $as_me.
--+# Run this file to recreate the current configuration.
--+# Compiler output produced by configure, useful for debugging
--+# configure, is in config.log if it exists.
--+
--+debug=false
--+ac_cs_recheck=false
--+ac_cs_silent=false
--+SHELL=\${CONFIG_SHELL-$SHELL}
--+_ACEOF
--+
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+## --------------------- ##
--+## M4sh Initialization. ##
--+## --------------------- ##
--+
--+# Be 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+"$@"}'='"$@"'
--+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--+ set -o posix
--+fi
--+DUALCASE=1; export DUALCASE # for MKS sh
--+
--+# Support unset when possible.
--+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--+ as_unset=unset
--+else
--+ as_unset=false
--+fi
--+
--+
--+# Work around bugs in pre-3.0 UWIN ksh.
--+$as_unset ENV MAIL MAILPATH
--+PS1='$ '
--+PS2='> '
--+PS4='+ '
--+
--+# NLS nuisances.
--+for as_var in \
--+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--+ LC_TELEPHONE LC_TIME
--+do
--+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--+ eval $as_var=C; export $as_var
--+ else
--+ $as_unset $as_var
--+ fi
--+done
--+
--+# Required to use basename.
--+if expr a : '\(a\)' >/dev/null 2>&1; then
--+ as_expr=expr
--+else
--+ as_expr=false
--+fi
--+
--+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
--+ as_basename=basename
--+else
--+ as_basename=false
--+fi
--+
--+
--+# Name of the executable.
--+as_me=`$as_basename "$0" ||
--+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
--+ X"$0" : 'X\(//\)$' \| \
--+ X"$0" : 'X\(/\)$' \| \
--+ . : '\(.\)' 2>/dev/null ||
--+echo X/"$0" |
--+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--+ /^X\/\(\/\/\)$/{ s//\1/; q; }
--+ /^X\/\(\/\).*/{ s//\1/; q; }
--+ s/.*/./; q'`
--+
--+
--+# PATH needs CR, and LINENO needs CR and PATH.
--+# Avoid depending upon Character Ranges.
--+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--+as_cr_digits='0123456789'
--+as_cr_alnum=$as_cr_Letters$as_cr_digits
--+
--+# The user is always right.
--+if test "${PATH_SEPARATOR+set}" != set; then
--+ echo "#! /bin/sh" >conf$$.sh
--+ echo "exit 0" >>conf$$.sh
--+ chmod +x conf$$.sh
--+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--+ PATH_SEPARATOR=';'
--+ else
--+ PATH_SEPARATOR=:
--+ fi
--+ rm -f conf$$.sh
--+fi
--+
--+
--+ as_lineno_1=$LINENO
--+ as_lineno_2=$LINENO
--+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--+ test "x$as_lineno_1" != "x$as_lineno_2" &&
--+ test "x$as_lineno_3" = "x$as_lineno_2" || {
--+ # Find who we are. Look in the path if we contain no path at all
--+ # relative or not.
--+ case $0 in
--+ *[\\/]* ) as_myself=$0 ;;
--+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--+for as_dir in $PATH
--+do
--+ IFS=$as_save_IFS
--+ test -z "$as_dir" && as_dir=.
--+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--+done
--+
--+ ;;
--+ esac
--+ # We did not find ourselves, most probably we were run as `sh COMMAND'
--+ # in which case we are not to be found in the path.
--+ if test "x$as_myself" = x; then
--+ as_myself=$0
--+ fi
--+ if test ! -f "$as_myself"; then
--+ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--+ { (exit 1); exit 1; }; }
--+ fi
--+ case $CONFIG_SHELL in
--+ '')
--+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--+do
--+ IFS=$as_save_IFS
--+ test -z "$as_dir" && as_dir=.
--+ for as_base in sh bash ksh sh5; do
--+ case $as_dir in
--+ /*)
--+ if ("$as_dir/$as_base" -c '
--+ as_lineno_1=$LINENO
--+ as_lineno_2=$LINENO
--+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--+ test "x$as_lineno_1" != "x$as_lineno_2" &&
--+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
--+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--+ CONFIG_SHELL=$as_dir/$as_base
--+ export CONFIG_SHELL
--+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--+ fi;;
--+ esac
--+ done
--+done
--+;;
--+ esac
--+
--+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--+ # uniformly replaced by the line number. The first 'sed' inserts a
--+ # line-number line before each line; the second 'sed' does the real
--+ # work. The second script uses 'N' to pair each line-number line
--+ # with the numbered line, and appends trailing '-' during
--+ # substitution so that $LINENO is not a special case at line end.
--+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
--+ sed '=' <$as_myself |
--+ sed '
--+ N
--+ s,$,-,
--+ : loop
--+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
--+ t loop
--+ s,-$,,
--+ s,^['$as_cr_digits']*\n,,
--+ ' >$as_me.lineno &&
--+ chmod +x $as_me.lineno ||
--+ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
--+ { (exit 1); exit 1; }; }
--+
--+ # Don't try to exec as it changes $[0], causing all sort of problems
--+ # (the dirname of $[0] is not the place where we might find the
--+ # original and so on. Autoconf is especially sensible to this).
--+ . ./$as_me.lineno
--+ # Exit status is that of the last command.
--+ exit
--+}
--+
--+
--+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--+ *c*,-n*) ECHO_N= ECHO_C='
--+' ECHO_T=' ' ;;
--+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
--+esac
--+
--+if expr a : '\(a\)' >/dev/null 2>&1; then
--+ as_expr=expr
--+else
--+ as_expr=false
--+fi
--+
--+rm -f conf$$ conf$$.exe conf$$.file
--+echo >conf$$.file
--+if ln -s conf$$.file conf$$ 2>/dev/null; then
--+ # We could just check for DJGPP; but this test a) works b) is more generic
--+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--+ if test -f conf$$.exe; then
--+ # Don't use ln at all; we don't have any links
--+ as_ln_s='cp -p'
--+ else
--+ as_ln_s='ln -s'
--+ fi
--+elif ln conf$$.file conf$$ 2>/dev/null; then
--+ as_ln_s=ln
--+else
--+ as_ln_s='cp -p'
--+fi
--+rm -f conf$$ conf$$.exe conf$$.file
--+
--+if mkdir -p . 2>/dev/null; then
--+ as_mkdir_p=:
--+else
--+ test -d ./-p && rmdir ./-p
--+ as_mkdir_p=false
--+fi
--+
--+as_executable_p="test -f"
--+
--+# Sed expression to map a string onto a valid CPP name.
--+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
--+
--+# Sed expression to map a string onto a valid variable name.
--+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
--+
--+
--+# IFS
--+# We need space, tab and new line, in precisely that order.
--+as_nl='
--+'
--+IFS=" $as_nl"
--+
--+# CDPATH.
--+$as_unset CDPATH
--+
--+exec 6>&1
--+
--+# Open the log real soon, to keep \$[0] and so on meaningful, and to
--+# report actual input values of CONFIG_FILES etc. instead of their
--+# values after options handling. Logging --version etc. is OK.
--+exec 5>>config.log
--+{
--+ echo
--+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--+## Running $as_me. ##
--+_ASBOX
--+} >&5
--+cat >&5 <<_CSEOF
--+
--+This file was extended by $as_me, which was
--+generated by GNU Autoconf 2.59. Invocation command line was
--+
--+ CONFIG_FILES = $CONFIG_FILES
--+ CONFIG_HEADERS = $CONFIG_HEADERS
--+ CONFIG_LINKS = $CONFIG_LINKS
--+ CONFIG_COMMANDS = $CONFIG_COMMANDS
--+ $ $0 $@
--+
--+_CSEOF
--+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--+echo >&5
--+_ACEOF
--+
--+# Files that config.status was made for.
--+if test -n "$ac_config_files"; then
--+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--+fi
--+
--+if test -n "$ac_config_headers"; then
--+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--+fi
--+
--+if test -n "$ac_config_links"; then
--+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--+fi
--+
--+if test -n "$ac_config_commands"; then
--+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--+fi
--+
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+
--+ac_cs_usage="\
--+\`$as_me' instantiates files from templates according to the
--+current configuration.
--+
--+Usage: $0 [OPTIONS] [FILE]...
--+
--+ -h, --help print this help, then exit
--+ -V, --version print version number, then exit
--+ -q, --quiet do not print progress messages
--+ -d, --debug don't remove temporary files
--+ --recheck update $as_me by reconfiguring in the same conditions
--+ --file=FILE[:TEMPLATE]
--+ instantiate the configuration file FILE
--+ --header=FILE[:TEMPLATE]
--+ instantiate the configuration header FILE
--+
--+Configuration files:
--+$config_files
--+
--+Configuration headers:
--+$config_headers
--+
--+Configuration commands:
--+$config_commands
--+
--+Report bugs to <bug-autoconf at gnu.org>."
--+_ACEOF
--+
--+cat >>$CONFIG_STATUS <<_ACEOF
--+ac_cs_version="\\
--+config.status
--+configured by $0, generated by GNU Autoconf 2.59,
--+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--+
--+Copyright (C) 2003 Free Software Foundation, Inc.
--+This config.status script is free software; the Free Software Foundation
--+gives unlimited permission to copy, distribute and modify it."
--+srcdir=$srcdir
--+INSTALL="$INSTALL"
--+_ACEOF
--+
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+# If no file are specified by the user, then we need to provide default
--+# value. By we need to know if files were specified by the user.
--+ac_need_defaults=:
--+while test $# != 0
--+do
--+ case $1 in
--+ --*=*)
--+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
--+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
--+ ac_shift=:
--+ ;;
--+ -*)
--+ ac_option=$1
--+ ac_optarg=$2
--+ ac_shift=shift
--+ ;;
--+ *) # This is not an option, so the user has probably given explicit
--+ # arguments.
--+ ac_option=$1
--+ ac_need_defaults=false;;
--+ esac
--+
--+ case $ac_option in
--+ # Handling of the options.
--+_ACEOF
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
--+ ac_cs_recheck=: ;;
--+ --version | --vers* | -V )
--+ echo "$ac_cs_version"; exit 0 ;;
--+ --he | --h)
--+ # Conflict between --help and --header
--+ { { echo "$as_me:$LINENO: error: ambiguous option: $1
--+Try \`$0 --help' for more information." >&5
--+echo "$as_me: error: ambiguous option: $1
--+Try \`$0 --help' for more information." >&2;}
--+ { (exit 1); exit 1; }; };;
--+ --help | --hel | -h )
--+ echo "$ac_cs_usage"; exit 0 ;;
--+ --debug | --d* | -d )
--+ debug=: ;;
--+ --file | --fil | --fi | --f )
--+ $ac_shift
--+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
--+ ac_need_defaults=false;;
--+ --header | --heade | --head | --hea )
--+ $ac_shift
--+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
--+ ac_need_defaults=false;;
--+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
--+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
--+ ac_cs_silent=: ;;
--+
--+ # This is an error.
--+ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--+Try \`$0 --help' for more information." >&5
--+echo "$as_me: error: unrecognized option: $1
--+Try \`$0 --help' for more information." >&2;}
--+ { (exit 1); exit 1; }; } ;;
--+
--+ *) ac_config_targets="$ac_config_targets $1" ;;
--+
--+ esac
--+ shift
--+done
--+
--+ac_configure_extra_args=
--+
--+if $ac_cs_silent; then
--+ exec 6>/dev/null
--+ ac_configure_extra_args="$ac_configure_extra_args --silent"
--+fi
--+
--+_ACEOF
--+cat >>$CONFIG_STATUS <<_ACEOF
--+if \$ac_cs_recheck; then
--+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
--+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
--+fi
--+
--+_ACEOF
--+
--+cat >>$CONFIG_STATUS <<_ACEOF
--+#
--+# INIT-COMMANDS section.
--+#
--+
--+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
--+
--+_ACEOF
--+
--+
--+
--+cat >>$CONFIG_STATUS <<\_ACEOF
--+for ac_config_target in $ac_config_targets
--+do
--+ case "$ac_config_target" in
--+ # Handling of arguments.
--+ "include/xmlsec/version.h" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/version.h" ;;
--+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--+ "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
--+ "include/xmlsec/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/Makefile" ;;
--+ "include/xmlsec/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/private/Makefile" ;;
--+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
--+ "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;;
--+ "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
--+ "docs/api/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;;
--+ "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
--+ "xmlsec1Conf.sh" ) CONFIG_FILES="$CONFIG_FILES xmlsec1Conf.sh:xmlsecConf.sh.in" ;;
--+ "xmlsec1-config" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-config:xmlsec-config.in" ;;
--+ "xmlsec1-openssl.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-openssl.pc:xmlsec-openssl.pc.in" ;;
--+ "xmlsec1-gnutls.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-gnutls.pc:xmlsec-gnutls.pc.in" ;;
--+ "xmlsec1-nss.pc" ) CONFIG_FILES="$CONFIG_FILES xmlsec1-nss.pc:xmlsec-nss.pc.in" ;;
--+ "xmlsec1.spec" ) CONFIG_FILES="$CONFIG_FILES xmlsec1.spec:xmlsec.spec.in" ;;
--+ "include/xmlsec/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/openssl/Makefile" ;;
--+ "src/openssl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/openssl/Makefile" ;;
--+ "include/xmlsec/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/gnutls/Makefile" ;;
--+ "src/gnutls/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnutls/Makefile" ;;
--+ "include/xmlsec/nss/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/nss/Makefile" ;;
--+ "src/nss/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/nss/Makefile" ;;
--+ "include/xmlsec/mscrypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/xmlsec/mscrypto/Makefile" ;;
--+ "src/mscrypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mscrypto/Makefile" ;;
--+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
--+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
--+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--+ { (exit 1); exit 1; }; };;
--+ esac
--+done
--+
--+# If the user did not use the arguments to specify the items to instantiate,
--+# then the envvar interface is used. Set only those that are not.
--+# We use the long form for the default assignment because of an extremely
--+# bizarre bug on SunOS 4.1.3.
--+if $ac_need_defaults; then
--+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
--+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
--+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
--+fi
--+
--+# Have a temporary directory for convenience. Make it in the build tree
--+# simply because there is no reason to put it here, and in addition,
--+# creating and moving files from /tmp can sometimes cause problems.
--+# Create a temporary directory, and hook for its removal unless debugging.
--+$debug ||
--+{
--+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
--+ trap '{ (exit 1); exit 1; }' 1 2 13 15
--+}
--+
--+# Create a (secure) tmp directory for tmp files.
--+
--+{
--+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
--+ test -n "$tmp" && test -d "$tmp"
--+} ||
--+{
--+ tmp=./confstat$$-$RANDOM
--+ (umask 077 && mkdir $tmp)
--+} ||
--+{
--+ echo "$me: cannot create a temporary directory in ." >&2
--+ { (exit 1); exit 1; }
--+}
--+
--+_ACEOF
--+
--+cat >>$CONFIG_STATUS <<_ACEOF
--+
--+#
--+# CONFIG_FILES section.
--+#
--+
--+# No need to generate the scripts if there are no CONFIG_FILES.
--+# This happens for instance when ./config.status config.h
--+if test -n "\$CONFIG_FILES"; then
--+ # Protect against being on the right side of a sed subst in config.status.
--+ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
--+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--+s, at SHELL@,$SHELL,;t t
--+s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--+s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--+s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--+s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--+s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--+s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--+s, at exec_prefix@,$exec_prefix,;t t
--+s, at prefix@,$prefix,;t t
--+s, at program_transform_name@,$program_transform_name,;t t
--+s, at bindir@,$bindir,;t t
--+s, at sbindir@,$sbindir,;t t
--+s, at libexecdir@,$libexecdir,;t t
--+s, at datadir@,$datadir,;t t
--+s, at sysconfdir@,$sysconfdir,;t t
--+s, at sharedstatedir@,$sharedstatedir,;t t
--+s, at localstatedir@,$localstatedir,;t t
--+s, at libdir@,$libdir,;t t
--+s, at includedir@,$includedir,;t t
--+s, at oldincludedir@,$oldincludedir,;t t
--+s, at infodir@,$infodir,;t t
--+s, at mandir@,$mandir,;t t
--+s, at build_alias@,$build_alias,;t t
--+s, at host_alias@,$host_alias,;t t
--+s, at target_alias@,$target_alias,;t t
--+s, at DEFS@,$DEFS,;t t
--+s, at ECHO_C@,$ECHO_C,;t t
--+s, at ECHO_N@,$ECHO_N,;t t
--+s, at ECHO_T@,$ECHO_T,;t t
--+s, at LIBS@,$LIBS,;t t
--+s, at build@,$build,;t t
--+s, at build_cpu@,$build_cpu,;t t
--+s, at build_vendor@,$build_vendor,;t t
--+s, at build_os@,$build_os,;t t
--+s, at host@,$host,;t t
--+s, at host_cpu@,$host_cpu,;t t
--+s, at host_vendor@,$host_vendor,;t t
--+s, at host_os@,$host_os,;t t
--+s, at XMLSEC_VERSION@,$XMLSEC_VERSION,;t t
--+s, at XMLSEC_PACKAGE@,$XMLSEC_PACKAGE,;t t
--+s, at XMLSEC_VERSION_SAFE@,$XMLSEC_VERSION_SAFE,;t t
--+s, at XMLSEC_VERSION_MAJOR@,$XMLSEC_VERSION_MAJOR,;t t
--+s, at XMLSEC_VERSION_MINOR@,$XMLSEC_VERSION_MINOR,;t t
--+s, at XMLSEC_VERSION_SUBMINOR@,$XMLSEC_VERSION_SUBMINOR,;t t
--+s, at XMLSEC_VERSION_INFO@,$XMLSEC_VERSION_INFO,;t t
--+s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--+s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--+s, at INSTALL_DATA@,$INSTALL_DATA,;t t
--+s, at CYGPATH_W@,$CYGPATH_W,;t t
--+s, at PACKAGE@,$PACKAGE,;t t
--+s, at VERSION@,$VERSION,;t t
--+s, at ACLOCAL@,$ACLOCAL,;t t
--+s, at AUTOCONF@,$AUTOCONF,;t t
--+s, at AUTOMAKE@,$AUTOMAKE,;t t
--+s, at AUTOHEADER@,$AUTOHEADER,;t t
--+s, at MAKEINFO@,$MAKEINFO,;t t
--+s, at AMTAR@,$AMTAR,;t t
--+s, at install_sh@,$install_sh,;t t
--+s, at STRIP@,$STRIP,;t t
--+s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
--+s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
--+s, at mkdir_p@,$mkdir_p,;t t
--+s, at AWK@,$AWK,;t t
--+s, at SET_MAKE@,$SET_MAKE,;t t
--+s, at am__leading_dot@,$am__leading_dot,;t t
--+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
--+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
--+s, at MAINT@,$MAINT,;t t
--+s, at CC@,$CC,;t t
--+s, at CFLAGS@,$CFLAGS,;t t
--+s, at LDFLAGS@,$LDFLAGS,;t t
--+s, at CPPFLAGS@,$CPPFLAGS,;t t
--+s, at ac_ct_CC@,$ac_ct_CC,;t t
--+s, at EXEEXT@,$EXEEXT,;t t
--+s, at OBJEXT@,$OBJEXT,;t t
--+s, at DEPDIR@,$DEPDIR,;t t
--+s, at am__include@,$am__include,;t t
--+s, at am__quote@,$am__quote,;t t
--+s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
--+s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
--+s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
--+s, at CCDEPMODE@,$CCDEPMODE,;t t
--+s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
--+s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
--+s, at EGREP@,$EGREP,;t t
--+s, at LN_S@,$LN_S,;t t
--+s, at ECHO@,$ECHO,;t t
--+s, at AR@,$AR,;t t
--+s, at ac_ct_AR@,$ac_ct_AR,;t t
--+s, at RANLIB@,$RANLIB,;t t
--+s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--+s, at CPP@,$CPP,;t t
--+s, at CXX@,$CXX,;t t
--+s, at CXXFLAGS@,$CXXFLAGS,;t t
--+s, at ac_ct_CXX@,$ac_ct_CXX,;t t
--+s, at CXXDEPMODE@,$CXXDEPMODE,;t t
--+s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
--+s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
--+s, at CXXCPP@,$CXXCPP,;t t
--+s, at F77@,$F77,;t t
--+s, at FFLAGS@,$FFLAGS,;t t
--+s, at ac_ct_F77@,$ac_ct_F77,;t t
--+s, at LIBTOOL@,$LIBTOOL,;t t
--+s, at RM@,$RM,;t t
--+s, at CP@,$CP,;t t
--+s, at MV@,$MV,;t t
--+s, at TAR@,$TAR,;t t
--+s, at HELP2MAN@,$HELP2MAN,;t t
--+s, at MAN2HTML@,$MAN2HTML,;t t
--+s, at U@,$U,;t t
--+s, at ANSI2KNR@,$ANSI2KNR,;t t
--+s, at INSTALL_LTDL_TRUE@,$INSTALL_LTDL_TRUE,;t t
--+s, at INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t
--+s, at CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t
--+s, at CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
--+s, at LIBADD_DL@,$LIBADD_DL,;t t
--+s, at PKG_CONFIG_ENABLED@,$PKG_CONFIG_ENABLED,;t t
--+s, at PKG_CONFIG@,$PKG_CONFIG,;t t
--+s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
--+s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
--+s, at LIBXML262_CFLAGS@,$LIBXML262_CFLAGS,;t t
--+s, at LIBXML262_LIBS@,$LIBXML262_LIBS,;t t
--+s, at LIBXML_CONFIG@,$LIBXML_CONFIG,;t t
--+s, at LIBXML_MIN_VERSION@,$LIBXML_MIN_VERSION,;t t
--+s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
--+s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
--+s, at XMLSEC_NO_LIBXSLT@,$XMLSEC_NO_LIBXSLT,;t t
--+s, at LIBXSLT_CONFIG@,$LIBXSLT_CONFIG,;t t
--+s, at LIBXSLT_MIN_VERSION@,$LIBXSLT_MIN_VERSION,;t t
--+s, at OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
--+s, at OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
--+s, at OPENSSL097_CFLAGS@,$OPENSSL097_CFLAGS,;t t
--+s, at OPENSSL097_LIBS@,$OPENSSL097_LIBS,;t t
--+s, at XMLSEC_NO_OPENSSL_TRUE@,$XMLSEC_NO_OPENSSL_TRUE,;t t
--+s, at XMLSEC_NO_OPENSSL_FALSE@,$XMLSEC_NO_OPENSSL_FALSE,;t t
--+s, at XMLSEC_NO_OPENSSL@,$XMLSEC_NO_OPENSSL,;t t
--+s, at OPENSSL_CRYPTO_LIB@,$OPENSSL_CRYPTO_LIB,;t t
--+s, at OPENSSL_MIN_VERSION@,$OPENSSL_MIN_VERSION,;t t
--+s, at GNUTLS_CFLAGS@,$GNUTLS_CFLAGS,;t t
--+s, at GNUTLS_LIBS@,$GNUTLS_LIBS,;t t
--+s, at XMLSEC_NO_GNUTLS_TRUE@,$XMLSEC_NO_GNUTLS_TRUE,;t t
--+s, at XMLSEC_NO_GNUTLS_FALSE@,$XMLSEC_NO_GNUTLS_FALSE,;t t
--+s, at XMLSEC_NO_GNUTLS@,$XMLSEC_NO_GNUTLS,;t t
--+s, at GNUTLS_CRYPTO_LIB@,$GNUTLS_CRYPTO_LIB,;t t
--+s, at GNUTLS_MIN_VERSION@,$GNUTLS_MIN_VERSION,;t t
--+s, at NSS_CFLAGS@,$NSS_CFLAGS,;t t
--+s, at NSS_LIBS@,$NSS_LIBS,;t t
--+s, at XMLSEC_NO_NSS_TRUE@,$XMLSEC_NO_NSS_TRUE,;t t
--+s, at XMLSEC_NO_NSS_FALSE@,$XMLSEC_NO_NSS_FALSE,;t t
--+s, at XMLSEC_NO_NSS@,$XMLSEC_NO_NSS,;t t
--+s, at NSS_CRYPTO_LIB@,$NSS_CRYPTO_LIB,;t t
--+s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
--+s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
--+s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
--+s, at MSCRYPTO_CFLAGS@,$MSCRYPTO_CFLAGS,;t t
--+s, at MSCRYPTO_LIBS@,$MSCRYPTO_LIBS,;t t
-- s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
-- s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
-- s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
--@@ -34368,6 +36362,8 @@
-- s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-- s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-- s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
--+s, at MSCRYPTO_CFLAGS@,$MSCRYPTO_CFLAGS,;t t
--+s, at MSCRYPTO_LIBS@,$MSCRYPTO_LIBS,;t t
-- s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
-- s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
-- s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
- --- misc/xmlsec1-1.2.6/configure.in 2004-08-26 04:49:24.000000000 +0200
--+++ misc/build/xmlsec1-1.2.6/configure.in 2008-06-29 23:44:19.000000000 +0200
-++++ misc/build/xmlsec1-1.2.6/configure.in 2009-02-16 18:36:21.000000000 +0100
- @@ -143,7 +143,7 @@
- dnl find libxml
- dnl ==========================================================================
-@@ -2431,12 +328,12 @@
- NSS_FOUND="without"
- elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
- - PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
--+ PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
-++ PKG_CHECK_MODULES(NSS, nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION,
- [NSS_FOUND=yes],
- [NSS_FOUND=no])
- + AC_MSG_RESULT($NSS_FOUND)
- + if test "z$NSS_FOUND" = "zno" ; then
--+ PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
-++ PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION,
- + [NSS_FOUND=yes],
- + [NSS_FOUND=no])
- + AC_MSG_RESULT($NSS_FOUND)
+--- /dev/null 2008-06-06 22:36:48.000000000 +0200
++++ libxmlsec/xmlsec1-1.2.6-broken-system-nss.patch 2009-10-09 17:23:18.000000000 +0200
+@@ -0,0 +1,17 @@
++--- misc/xmlsec1-1.2.6/configure.in.old 2009-10-09 17:00:31.000000000 +0200
+++++ misc/build/xmlsec1-1.2.6/configure.in 2009-10-09 17:21:21.000000000 +0200
++@@ -535,12 +535,12 @@ if test "z$with_nss" = "zno" -o "z$with_
++ AC_MSG_RESULT(no)
++ NSS_FOUND="without"
++ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
++- PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
+++ PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
++ [NSS_FOUND=yes],
++ [NSS_FOUND=no])
++ AC_MSG_RESULT($NSS_FOUND)
++ if test "z$NSS_FOUND" = "zno" ; then
++- PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
+++ PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
++ [NSS_FOUND=yes],
++ [NSS_FOUND=no])
++ AC_MSG_RESULT($NSS_FOUND)
+--- libxmlsec/makefile.mk.old 2009-09-25 00:39:01.000000000 +0200
++++ libxmlsec/makefile.mk 2009-10-09 17:24:42.000000000 +0200
+@@ -49,7 +49,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+ XMLSEC1VERSION=1.2.6
+
+ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
+-PATCH_FILES=$(TARFILE_NAME).patch xmlsec1-1.2.6-mingwport24.patch
++PATCH_FILES=$(TARFILE_NAME).patch xmlsec1-1.2.6-mingwport24.patch xmlsec1-1.2.6-broken-system-nss.patch
+
+
+ ADDITIONAL_FILES= \
+@@ -141,7 +141,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
+
+ .ENDIF
+ CONFIGURE_DIR=
+-CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
++CONFIGURE_ACTION=autoconf && chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
+ CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
+ # system-mozilla needs pkgconfig to get the information about nss
+ # FIXME: This also will enable pkg-config usage for libxml2. It *seems*
commit a645deeb5644d5681b2cc089882634e4bdf0af85
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 12 17:16:40 2009 +0200
Use internal boost on SLED10, openSUSE-10.3, openSUSE-11.0
* distro-configs/SUSE-10.1.conf.in:
* distro-configs/SUSE-10.3.conf.in:
* distro-configs/SUSE-11.0.conf.in: remove --with-system-boost; boost >= 1.36
is required; it is not that important to port it
diff --git a/distro-configs/SUSE-10.1.conf.in b/distro-configs/SUSE-10.1.conf.in
index de3caed..14a0506 100644
--- a/distro-configs/SUSE-10.1.conf.in
+++ b/distro-configs/SUSE-10.1.conf.in
@@ -14,7 +14,6 @@
--with-external-hyph-dir=@libdir@/@OOOINSTALLDIRNAME@/basis at OOO_VERSION@/share/dictionaries
--with-external-thes-dir=@libdir@/@OOOINSTALLDIRNAME@/basis at OOO_VERSION@/share/dictionaries
--with-jdk-home=$JAVA_HOME
---with-system-boost
--with-system-cairo
--with-system-curl
--with-system-db
diff --git a/distro-configs/SUSE-10.3.conf.in b/distro-configs/SUSE-10.3.conf.in
index d73234d..9c13803 100644
--- a/distro-configs/SUSE-10.3.conf.in
+++ b/distro-configs/SUSE-10.3.conf.in
@@ -17,7 +17,6 @@
--with-external-thes-dir=/usr/share/ooo/thesaurus
--with-java-target-version=1.4
--with-jdk-home=$JAVA_HOME
---with-system-boost
--with-system-cairo
--with-system-curl
--with-system-db
diff --git a/distro-configs/SUSE-11.0.conf.in b/distro-configs/SUSE-11.0.conf.in
index 1667923..29800f1 100644
--- a/distro-configs/SUSE-11.0.conf.in
+++ b/distro-configs/SUSE-11.0.conf.in
@@ -19,7 +19,6 @@
--with-external-thes-dir=/usr/share/ooo/thesaurus
--with-java-target-version=1.5
--with-jdk-home=$JAVA_HOME
---with-system-boost
--with-system-cairo
--with-system-curl
--with-system-db
More information about the ooo-build-commit
mailing list