OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jul-2004 15:47:36
Branch: OPENPKG_2_1_SOLID Handle: 2004070714473600
Modified files: (Branch: OPENPKG_2_1_SOLID)
openpkg-src/apache apache.patch apache.spec
Log:
MFC: force apache to use OpenPKG expat
Summary:
Revision Changes Path
1.13.2.1 +25 -0 openpkg-src/apache/apache.patch
1.241.2.2 +1 -3 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.13 -r1.13.2.1 apache.patch
--- openpkg-src/apache/apache.patch 11 Jun 2004 14:42:25 -0000 1.13
+++ openpkg-src/apache/apache.patch 7 Jul 2004 13:47:36 -0000 1.13.2.1
@@ -79,3 +79,28 @@
}
+Index: Configure
+--- apache_1.3.31/src/Configure.orig 2004-04-09 19:01:50 +0200
++++ apache_1.3.31/src/Configure 2004-07-06 22:05:44 +0200
+@@ -1869,19 +1875,8 @@
+ fi
+
+ if [ "x$RULE_EXPAT" = "xyes" ]; then
+- if ./helpers/TestCompile lib expat; then
+- echo " + using system Expat"
+- LIBS="$LIBS -lexpat"
+- else
+- if [ ! -d ./lib/expat-lite/ ]; then
+- echo "ERROR: RULE_EXPAT set to \"yes\" but is not available."
+- exit 1
+- fi
+- echo " + using builtin Expat"
+- EXPATLIB="lib/expat-lite/libexpat.a"
+- APLIBDIRS="expat-lite $APLIBDIRS"
+- CFLAGS="$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite"
+- fi
++ echo " + using system Expat"
++ LIBS="$LIBS -lexpat"
+ fi
+
+ ####################################################################
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.241.2.1 -r1.241.2.2 apache.spec
--- openpkg-src/apache/apache.spec 2 Jul 2004 15:23:49 -0000 1.241.2.1
+++ openpkg-src/apache/apache.spec 7 Jul 2004 13:47:36 -0000 1.241.2.2
@@ -1106,10 +1106,8 @@
%endif
%if "%{with_mod_dav}" == "yes"
--activate-module=src/modules/dav/libdav.a \
- --enable-rule=EXPAT \
-%else
- --disable-rule=EXPAT \
%endif
+ --disable-rule=EXPAT \
%if "%{with_shared_core}" == "yes"
--enable-rule=SHARED_CORE \
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
