[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit f1815101336354fb76d07955b21750176e955d08
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 16 20:30:22 2003 +0000

            Reviewed by John.
    
            - cure problem where we keep competing to check in config.h with/without HAVE_FOUNDATION_SOURCSE
    
            * Makefile.am: Remove the HAVE_FOUNDATION_SOURCES line.
            * config.h: Check in without that line.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4661 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6cdae93..49a4b19 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-07-16  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - cure problem where we keep competing to check in config.h with/without HAVE_FOUNDATION_SOURCSE
+
+        * Makefile.am: Remove the HAVE_FOUNDATION_SOURCES line.
+        * config.h: Check in without that line.
+
 2003-07-16  Vicki Murley  <vicki at apple.com>
 
         Reviewed by kocienda. 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6cdae93..49a4b19 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-07-16  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - cure problem where we keep competing to check in config.h with/without HAVE_FOUNDATION_SOURCSE
+
+        * Makefile.am: Remove the HAVE_FOUNDATION_SOURCES line.
+        * config.h: Check in without that line.
+
 2003-07-16  Vicki Murley  <vicki at apple.com>
 
         Reviewed by kocienda. 
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index 4a72e88..b411c8c 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -14,9 +14,11 @@ WebCore-combined.exp: WebCore.exp WebCore-tests.exp previous-clean-timestamp
 config.h: config-timestamp
 
 config-timestamp: ../config.h previous-clean-timestamp
-	if ! cmp -s config.h ../config.h; then \
-	    cat ../config.h > config.h; \
+	perl -ne 'print unless /HAVE_FOUNDATION_SOURCES/' < ../config.h > munged-config.h
+	if ! cmp -s config.h munged-config.h; then \
+	    cat munged-config.h > config.h; \
 	fi
+	rm munged-config.h
 	touch $@
 
 noinst_DATA = WebCore-combined.exp
diff --git a/WebCore/config.h b/WebCore/config.h
index 631388c..d6cc425 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -18,7 +18,6 @@
 #define HAVE_FORK 1
 
 /* Define if Foundation source tree exists */
-/* #undef HAVE_FOUNDATION_SOURCES */
 
 /* Define if you have finite */
 #define HAVE_FUNC_FINITE 1

-- 
WebKit Debian packaging