[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 a9db96d01f0fa618df8cb2167e91701585bd76a8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 22 04:22:35 2003 +0000

            * Makefile.am: Work around DLCFN issue to prevent constant churn of config.h.
            * config.h: Regenerated without DLCFN.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4878 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index de9fe47..7e182f0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2003-08-21  Darin Adler  <darin at apple.com>
 
+        * Makefile.am: Work around DLCFN issue to prevent constant churn of config.h.
+        * config.h: Regenerated without DLCFN.
+
+2003-08-21  Darin Adler  <darin at apple.com>
+
         * khtml/khtmlview.h: Formatting tweak.
 
 2003-08-21  Chris Blumenberg  <cblu at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index de9fe47..7e182f0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2003-08-21  Darin Adler  <darin at apple.com>
 
+        * Makefile.am: Work around DLCFN issue to prevent constant churn of config.h.
+        * config.h: Regenerated without DLCFN.
+
+2003-08-21  Darin Adler  <darin at apple.com>
+
         * khtml/khtmlview.h: Formatting tweak.
 
 2003-08-21  Chris Blumenberg  <cblu at apple.com>
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index b411c8c..25496af 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -14,7 +14,7 @@ WebCore-combined.exp: WebCore.exp WebCore-tests.exp previous-clean-timestamp
 config.h: config-timestamp
 
 config-timestamp: ../config.h previous-clean-timestamp
-	perl -ne 'print unless /HAVE_FOUNDATION_SOURCES/' < ../config.h > munged-config.h
+	perl -ne 'print unless /HAVE_FOUNDATION_SOURCES/ || /DLFCN/' < ../config.h > munged-config.h
 	if ! cmp -s config.h munged-config.h; then \
 	    cat munged-config.h > config.h; \
 	fi
diff --git a/WebCore/config.h b/WebCore/config.h
index 34666ee..8dd7ea8 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -6,7 +6,6 @@
 #define HAVE_DIRENT_H 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
 
 /* Define to 1 if you have the <float.h> header file. */
 #define HAVE_FLOAT_H 1

-- 
WebKit Debian packaging