[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:56:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b12e4b434e5f3668865489e392813f821a3d973f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 22 15:21:34 2003 +0000
Reviewed by Ken.
- research determined we were using nothing defined in config.h, so I got rid of it
* Makefile.am: Removed rules to generate config.h.
* config.h: Removed.
* WebCore.pbproj/project.pbxproj: Removed define of HAVE_CONFIG_H.
* WebCorePrefix.h: Removed include of <config.h>.
* ForwardingHeaders/config.h: Emptied this file out. Can't remove this because there are
some includes of <config.h> without HAVE_CONFIG_H wrappers.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5029 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 98bb61f..701749b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-09-22 Darin Adler <darin at apple.com>
+
+ Reviewed by Ken.
+
+ - research determined we were using nothing defined in config.h, so I got rid of it
+
+ * Makefile.am: Removed rules to generate config.h.
+ * config.h: Removed.
+
+ * WebCore.pbproj/project.pbxproj: Removed define of HAVE_CONFIG_H.
+
+ * WebCorePrefix.h: Removed include of <config.h>.
+
+ * ForwardingHeaders/config.h: Emptied this file out. Can't remove this because there are
+ some includes of <config.h> without HAVE_CONFIG_H wrappers.
+
2003-09-21 Darin Adler <darin at apple.com>
Reviewed by Dave.
@@ -689,17 +705,6 @@
(RenderText::containsOnlyWhitespace):
* khtml/xml/dom_stringimpl.cpp:
-2003-08-27 Richard Williamson <rjw at apple.com>
-
- Reviewed by NOBODY (OOPS!).
-
- * khtml/rendering/bidi.cpp:
- * khtml/rendering/render_text.cpp:
- (RenderText::trimmedMinMaxWidth):
- (RenderText::calcMinMaxWidth):
- (RenderText::containsOnlyWhitespace):
- * khtml/xml/dom_stringimpl.cpp:
-
2003-08-27 David Hyatt <hyatt at apple.com>
Fix for 3396962, hang on quote.com. Fieldsets with display:inline should be treated
@@ -3640,8 +3645,6 @@
2003-06-02 Ken Kocienda <kocienda at apple.com>
- Reviewed by NOBODY (OOPS!).
-
* config.h:
2003-06-02 David Hyatt <hyatt at apple.com>
@@ -3701,8 +3704,6 @@
the cases where the control has not overridden the default
with a different value.
- Reviewed by NOBODY (OOPS!).
-
* khtml/html/html_formimpl.cpp:
(HTMLInputElementImpl::HTMLInputElementImpl):
(HTMLInputElementImpl::state):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 98bb61f..701749b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-09-22 Darin Adler <darin at apple.com>
+
+ Reviewed by Ken.
+
+ - research determined we were using nothing defined in config.h, so I got rid of it
+
+ * Makefile.am: Removed rules to generate config.h.
+ * config.h: Removed.
+
+ * WebCore.pbproj/project.pbxproj: Removed define of HAVE_CONFIG_H.
+
+ * WebCorePrefix.h: Removed include of <config.h>.
+
+ * ForwardingHeaders/config.h: Emptied this file out. Can't remove this because there are
+ some includes of <config.h> without HAVE_CONFIG_H wrappers.
+
2003-09-21 Darin Adler <darin at apple.com>
Reviewed by Dave.
@@ -689,17 +705,6 @@
(RenderText::containsOnlyWhitespace):
* khtml/xml/dom_stringimpl.cpp:
-2003-08-27 Richard Williamson <rjw at apple.com>
-
- Reviewed by NOBODY (OOPS!).
-
- * khtml/rendering/bidi.cpp:
- * khtml/rendering/render_text.cpp:
- (RenderText::trimmedMinMaxWidth):
- (RenderText::calcMinMaxWidth):
- (RenderText::containsOnlyWhitespace):
- * khtml/xml/dom_stringimpl.cpp:
-
2003-08-27 David Hyatt <hyatt at apple.com>
Fix for 3396962, hang on quote.com. Fieldsets with display:inline should be treated
@@ -3640,8 +3645,6 @@
2003-06-02 Ken Kocienda <kocienda at apple.com>
- Reviewed by NOBODY (OOPS!).
-
* config.h:
2003-06-02 David Hyatt <hyatt at apple.com>
@@ -3701,8 +3704,6 @@
the cases where the control has not overridden the default
with a different value.
- Reviewed by NOBODY (OOPS!).
-
* khtml/html/html_formimpl.cpp:
(HTMLInputElementImpl::HTMLInputElementImpl):
(HTMLInputElementImpl::state):
diff --git a/WebCore/ForwardingHeaders/config.h b/WebCore/ForwardingHeaders/config.h
index f97325b..e69de29 100644
--- a/WebCore/ForwardingHeaders/config.h
+++ b/WebCore/ForwardingHeaders/config.h
@@ -1 +0,0 @@
-#include "../config.h"
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index 25496af..460f6f7 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = khtml kwq
-all-am: previous-clean-timestamp previous-js-clean-timestamp config-timestamp
+all-am: previous-clean-timestamp previous-js-clean-timestamp
pbxbuild -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
clean-am:
pbxbuild clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
@@ -11,20 +11,9 @@ clean-am:
WebCore-combined.exp: WebCore.exp WebCore-tests.exp previous-clean-timestamp
cat $^ > $@
-config.h: config-timestamp
-
-config-timestamp: ../config.h previous-clean-timestamp
- 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
- rm munged-config.h
- touch $@
-
noinst_DATA = WebCore-combined.exp
-noinst_HEADERS = config.h
BUILT_SOURCES = $(noinst_DATA) $(noinst_HEADERS)
-CLEANFILES = $(BUILT_SOURCES) config-timestamp
+CLEANFILES = $(BUILT_SOURCES)
previous-clean-timestamp: force-clean-timestamp
make clean && touch $@ && touch previous-js-clean-timestamp
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index c502bab..514d39e 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -153,7 +153,7 @@
LOCAL_SEG1_ADDR = 0x9000000;
MACOSX_DEPLOYMENT_TARGET = 10.2;
OPTIMIZATION_CFLAGS = "-Os";
- OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
+ OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES";
OTHER_LDFLAGS = "-no-c++filt -umbrella WebKit";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = WebCorePrefix.h;
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index 6f0dac0..e57685a 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -1,5 +1,3 @@
-#include <config.h>
-
#include <assert.h>
#include <ctype.h>
#include <fcntl.h>
diff --git a/WebCore/config.h b/WebCore/config.h
deleted file mode 100644
index 8dd7ea8..0000000
--- a/WebCore/config.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* config.h. Generated by configure. */
-/* config.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-
-/* Define to 1 if you have the <float.h> header file. */
-#define HAVE_FLOAT_H 1
-
-/* Define to 1 if you have the <fnmatch.h> header file. */
-#define HAVE_FNMATCH_H 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define if Foundation source tree exists */
-
-/* Define if you have finite */
-#define HAVE_FUNC_FINITE 1
-
-/* Define if you have isinf */
-#define HAVE_FUNC_ISINF 1
-
-/* Define if you have isnan */
-#define HAVE_FUNC_ISNAN 1
-
-/* Define if you have _finite */
-/* #undef HAVE_FUNC__FINITE */
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the <ieeefp.h> header file. */
-/* #undef HAVE_IEEEFP_H */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-/* #undef HAVE_MALLOC_H */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkstemp' function. */
-#define HAVE_MKSTEMP 1
-
-/* Define to 1 if you have the `mkstemps' function. */
-#define HAVE_MKSTEMPS 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the <paths.h> header file. */
-#define HAVE_PATHS_H 1
-
-/* Define to 1 if you have the `random' function. */
-#define HAVE_RANDOM 1
-
-/* Define to 1 if you have the `setegid' function. */
-#define HAVE_SETEGID 1
-
-/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
-
-/* Define to 1 if you have the `seteuid' function. */
-#define HAVE_SETEUID 1
-
-/* Define to 1 if you have the <sigaction.h> header file. */
-/* #undef HAVE_SIGACTION_H */
-
-/* Define to 1 if you have the `socket' function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if you have the <socketbits.h> header file. */
-/* #undef HAVE_SOCKETBITS_H */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `stpcpy' function. */
-#define HAVE_STPCPY 1
-
-/* Define to 1 if you have the `strfmon' function. */
-#define HAVE_STRFMON 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sysent.h> header file. */
-/* #undef HAVE_SYSENT_H */
-
-/* Define to 1 if you have the <sys/cdefs.h> header file. */
-#define HAVE_SYS_CDEFS_H 1
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
- */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
- */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `unsetenv' function. */
-#define HAVE_UNSETENV 1
-
-/* Define to 1 if you have the `vfork' function. */
-#define HAVE_VFORK 1
-
-/* Define to 1 if you have the <vfork.h> header file. */
-/* #undef HAVE_VFORK_H */
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
-/* Define to 1 if `fork' works. */
-#define HAVE_WORKING_FORK 1
-
-/* Define to 1 if `vfork' works. */
-#define HAVE_WORKING_VFORK 1
-
-/* Name of package */
-#define PACKAGE "Labyrinth"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Version number of package */
-#define VERSION "not-versioned"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
-/* #undef inline */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-/* Define as `fork' if `vfork' does not work. */
-/* #undef vfork */
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list