20380 2008-08-14 04:07:12 -0700 [GTK][AUTOTOOLS] Include autotoolsconfig.h from config.h 2008-09-04 13:26:47 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED Gtk P2 Normal --- 1 marco.barisione marco.barisione alp jmalonzo marco.barisione oldest_to_newest 88470 0 marco.barisione 2008-08-14 04:07:12 -0700 Projects using autotools usually have an auto-generated config.h file containing various defines on the functions and libraries available. WebKit already contained a config.h file in WebCore, so the config file is called aconfig.h instead of config.h but this file is never included. 88474 1 22789 marco.barisione 2008-08-14 05:13:22 -0700 Created attachment 22789 Include aconfig.h if available 88640 2 22789 alp 2008-08-16 14:31:48 -0700 Comment on attachment 22789 Include aconfig.h if available >diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog >index b0f0978..99285df 100644 >--- a/JavaScriptCore/ChangeLog >+++ b/JavaScriptCore/ChangeLog >@@ -1,3 +1,13 @@ >+2008-08-14 Marco Barisione <marco.barisione@collabora.co.uk> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ http://bugs.webkit.org/show_bug.cgi?id=20380 >+ [GTK][AUTOTOOLS] Include aconfig.h from config.h >+ >+ * kjs/config.h: include the aconfig.h generated by autotools if >+ available >+ > 2008-08-13 Geoffrey Garen <ggaren@apple.com> > > Reviewed by Oliver Hunt. >diff --git a/JavaScriptCore/kjs/config.h b/JavaScriptCore/kjs/config.h >index f87b664..e4a6792 100644 >--- a/JavaScriptCore/kjs/config.h >+++ b/JavaScriptCore/kjs/config.h >@@ -21,6 +21,10 @@ > > #include <wtf/Platform.h> > >+#if PLATFORM(GTK) && defined(HAVE_CONFIG_H) >+#include "aconfig.h" >+#endif >+ Here and in other places, aconfig.h is included after wtf/Platform.h in the patch. wtf/Platform.h tests for various configurable flags that we currently define using compiler arguments, but that we want to define in aconfig.h in future, eg: #if !defined(ENABLE_DATABASE) #define ENABLE_DATABASE 1 #endif So for that to work, aconfig.h needs to be included at the very top of the config.h files as far as I can tell, rather than mid-way as this patch does. Any thoughts on that? 88667 3 marco.barisione 2008-08-17 05:02:25 -0700 (In reply to comment #2) > So for that to work, aconfig.h needs to be included at the very top of the > config.h files as far as I can tell, rather than mid-way as this patch does. > Any thoughts on that? But the PLATFORM macro is defined in Platform.h, so if we want to ue it we need to include Platform.h. Do you think that other ports could be defining a HAVE_CONFIG_H macro? If not we could just remove the check for the platform, or we could check for "defined(WTF_PLATFORM_GTK) && WTF_PLATFORM_GTK". 89339 4 22789 eric 2008-08-25 21:07:15 -0700 Comment on attachment 22789 Include aconfig.h if available JavaScriptGlue is a mac-only project, I don't see why it would need any changes to config.h Why is aconfig.h needed? Could it have a better name too? Like autoconf_config.h or similar? The Mac and Windows ports pass various ENABLE_ defines via compiler flags. I would assume that the Automake system would do the same, but I guess you're suggesting that the automake way is to pass these ENABLE_* defines as part of aconfig.h? Marking r- and waiting for further clarification. 89999 5 marco.barisione 2008-09-03 04:08:04 -0700 (In reply to comment #4) > JavaScriptGlue is a mac-only project, I don't see why it would need any changes > to config.h Ok, I will remove it. > Why is aconfig.h needed? Could it have a better name too? Like > autoconf_config.h or similar? THe standard name for it is config.h, probably Jan is the one who chose the aconfig.h name as config.h was already taken. Jan what do you think about the rename? > The Mac and Windows ports pass various ENABLE_ defines via compiler flags. I > would assume that the Automake system would do the same, but I guess you're > suggesting that the automake way is to pass these ENABLE_* defines as part of > aconfig.h? Yes. 90002 6 jmalonzo 2008-09-03 04:24:33 -0700 (In reply to comment #5) > > > Why is aconfig.h needed? Could it have a better name too? Like > > autoconf_config.h or similar? > > THe standard name for it is config.h, probably Jan is the one who chose the > aconfig.h name as config.h was already taken. Jan what do you think about the > rename? Please rename it to something like gtkconfig.h or autotools_config.h. 90018 7 23141 marco.barisione 2008-09-03 06:54:14 -0700 Created attachment 23141 Include the autotools configuration header if available - Renamed aconfig.h to autotoolsconfig.h - Include the header only in WebCore and JSCore - Include the header before Platform.h - Donn't check if the platform is GTK as PLATFORM is defined in Platform.h and ohter ports don't define HAVE_CONFIG_H 90055 8 23141 eric 2008-09-03 13:30:00 -0700 Comment on attachment 23141 Include the autotools configuration header if available Seems sane enough. 90186 9 jmalonzo 2008-09-04 13:26:47 -0700 landed in r36098 22789 2008-08-14 05:13:22 -0700 2008-09-03 06:54:14 -0700 Include aconfig.h if available include-aconfig-h.patch text/plain 2646 marco.barisione ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBiMGYwOTc4Li45OTI4NWRmIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMDgtMDgtMTQgIE1hcmNvIEJhcmlzaW9uZSAgPG1hcmNvLmJhcmlzaW9uZUBjb2xsYWJv cmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODAKKyAgICAgICAg W0dUS11bQVVUT1RPT0xTXSBJbmNsdWRlIGFjb25maWcuaCBmcm9tIGNvbmZpZy5oCisKKyAgICAg ICAgKiBranMvY29uZmlnLmg6IGluY2x1ZGUgdGhlIGFjb25maWcuaCBnZW5lcmF0ZWQgYnkgYXV0 b3Rvb2xzIGlmCisgICAgICAgIGF2YWlsYWJsZQorCiAyMDA4LTA4LTEzICBHZW9mZnJleSBHYXJl biAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQu CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9ranMvY29uZmlnLmggYi9KYXZhU2NyaXB0Q29y ZS9ranMvY29uZmlnLmgKaW5kZXggZjg3YjY2NC4uZTRhNjc5MiAxMDA2NDQKLS0tIGEvSmF2YVNj cmlwdENvcmUva2pzL2NvbmZpZy5oCisrKyBiL0phdmFTY3JpcHRDb3JlL2tqcy9jb25maWcuaApA QCAtMjEsNiArMjEsMTAgQEAKIAogI2luY2x1ZGUgPHd0Zi9QbGF0Zm9ybS5oPgogCisjaWYgUExB VEZPUk0oR1RLKSAmJiBkZWZpbmVkKEhBVkVfQ09ORklHX0gpCisjaW5jbHVkZSAiYWNvbmZpZy5o IgorI2VuZGlmCisKICNpZiBQTEFURk9STShXSU5fT1MpCiAKIC8vIElmIHdlIGRvbid0IGRlZmlu ZSB0aGVzZSwgdGhleSBnZXQgZGVmaW5lZCBpbiB3aW5kZWYuaC4gCmRpZmYgLS1naXQgYS9KYXZh U2NyaXB0R2x1ZS9DaGFuZ2VMb2cgYi9KYXZhU2NyaXB0R2x1ZS9DaGFuZ2VMb2cKaW5kZXggZTRi NWYyNC4uYzY3YWM4YyAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdEdsdWUvQ2hhbmdlTG9nCisrKyBi L0phdmFTY3JpcHRHbHVlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDA4LTA4LTE0ICBN YXJjbyBCYXJpc2lvbmUgIDxtYXJjby5iYXJpc2lvbmVAY29sbGFib3JhLmNvLnVrPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzgwCisgICAgICAgIFtHVEtdW0FVVE9UT09MU10g SW5jbHVkZSBhY29uZmlnLmggZnJvbSBjb25maWcuaAorCisgICAgICAgICogY29uZmlnLmg6IGlu Y2x1ZGUgdGhlIGFjb25maWcuaCBnZW5lcmF0ZWQgYnkgYXV0b3Rvb2xzIGlmIGF2YWlsYWJsZQor CiAyMDA4LTA3LTMxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSdWJiZXItc3RhbXBlZCBieSBNYWNpZWouCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0R2x1 ZS9jb25maWcuaCBiL0phdmFTY3JpcHRHbHVlL2NvbmZpZy5oCmluZGV4IDM2NTE3ODUuLjU3MmFj NjEgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRHbHVlL2NvbmZpZy5oCisrKyBiL0phdmFTY3JpcHRH bHVlL2NvbmZpZy5oCkBAIC0zLDUgKzMsMTAgQEAKICNlbmRpZgogCiAjaW5jbHVkZSA8d3RmL1Bs YXRmb3JtLmg+CisKKyNpZiBQTEFURk9STShHVEspICYmIGRlZmluZWQoSEFWRV9DT05GSUdfSCkK KyNpbmNsdWRlICJhY29uZmlnLmgiCisjZW5kaWYKKwogI2luY2x1ZGUgPGtqcy9FeGVjU3RhdGUu aD4KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBmZmFjYTFhLi5lZmExMzM3IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDA4LTA4LTE0ICBNYXJjbyBC YXJpc2lvbmUgIDxtYXJjby5iYXJpc2lvbmVAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwMzgwCisgICAgICAgIFtHVEtdW0FVVE9UT09MU10gSW5jbHVk ZSBhY29uZmlnLmggZnJvbSBjb25maWcuaAorCisgICAgICAgICogY29uZmlnLmg6IGluY2x1ZGUg dGhlIGFjb25maWcuaCBnZW5lcmF0ZWQgYnkgYXV0b3Rvb2xzIGlmIGF2YWlsYWJsZQorCiAyMDA4 LTA4LTEzICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgQW5kZXJzIENhcmxzb24uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2NvbmZpZy5oIGIvV2ViQ29y ZS9jb25maWcuaAppbmRleCA2NDAyNWY3Li4xNDAxY2YyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2Nv bmZpZy5oCisrKyBiL1dlYkNvcmUvY29uZmlnLmgKQEAgLTIwLDYgKzIwLDEwIEBACiAKICNpbmNs dWRlIDx3dGYvUGxhdGZvcm0uaD4KIAorI2lmIFBMQVRGT1JNKEdUSykgJiYgZGVmaW5lZChIQVZF X0NPTkZJR19IKQorI2luY2x1ZGUgImFjb25maWcuaCIKKyNlbmRpZgorCiAjZGVmaW5lIE1PQklM RSAwCiAKICNpZmRlZiBfX0FQUExFX18K 23141 2008-09-03 06:54:14 -0700 2008-09-03 13:30:00 -0700 Include the autotools configuration header if available include-aconfig-h.patch text/plain 2705 marco.barisione ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBiZDA0YWFjLi4wZDRlYzEy IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMDgtMDktMDMgIE1hcmNvIEJhcmlzaW9uZSAgPG1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEu Y28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODAKKyAgICAgICAgW0dU S11bQVVUT1RPT0xTXSBJbmNsdWRlIGF1dG90b29sc2NvbmZpZy5oIGZyb20gY29uZmlnLmgKKwor ICAgICAgICAqIGNvbmZpZ3VyZS5hYzogUmVuYW1lIHRoZSBjb25maWd1cmF0aW9uIGhlYWRlciBm cm9tIGFjb25maWcuaCB0bworCWF1dG90b29sc2NvbmZpZy5oLgorCiAyMDA4LTA4LTI4ICBBbHAg VG9rZXIgIDxhbHBAbnVhbnRpLmNvbT4KIAogICAgICAgICBHVEsrIGRpc3QvYnVpbGQgZml4LiBM aXN0IG5ld2x5IGFkZGVkIGhlYWRlciBmaWxlcy4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3Jl L0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBlNWEyOTUyLi40MDNh ZmRiIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMDktMDMgIE1hcmNvIEJhcmlz aW9uZSAgPG1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjAzODAKKyAgICAgICAgW0dUS11bQVVUT1RPT0xTXSBJbmNsdWRlIGF1 dG90b29sc2NvbmZpZy5oIGZyb20gY29uZmlnLmgKKworICAgICAgICAqIGtqcy9jb25maWcuaDog SW5jbHVkZSB0aGUgY29uZmlndXJhdGlvbiBoZWFkZXIgZ2VuZXJhdGVkIGJ5CisgICAgICAgIGF1 dG90b29scyBpZiBhdmFpbGFibGUuCisKIDIwMDgtMDktMDIgIENzYWJhIE9zenRyb2dvbmFjICA8 b3N6aUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIu CmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9ranMvY29uZmlnLmggYi9KYXZhU2NyaXB0Q29y ZS9ranMvY29uZmlnLmgKaW5kZXggZjg3YjY2NC4uNzM4OTMxYSAxMDA2NDQKLS0tIGEvSmF2YVNj cmlwdENvcmUva2pzL2NvbmZpZy5oCisrKyBiL0phdmFTY3JpcHRDb3JlL2tqcy9jb25maWcuaApA QCAtMTksNiArMTksMTAgQEAKICAqCiAgKi8KIAorI2lmIEhBVkVfQ09ORklHX0gKKyNpbmNsdWRl ICJhdXRvdG9vbHNjb25maWcuaCIKKyNlbmRpZgorCiAjaW5jbHVkZSA8d3RmL1BsYXRmb3JtLmg+ CiAKICNpZiBQTEFURk9STShXSU5fT1MpCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBi L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDc2NDE1YWEuLjA3OGZlMjcgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMDgtMDktMDMgIE1hcmNvIEJhcmlzaW9uZSAgPG1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEu Y28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODAKKyAgICAgICAgW0dU S11bQVVUT1RPT0xTXSBJbmNsdWRlIGF1dG90b29sc2NvbmZpZy5oIGZyb20gY29uZmlnLmgKKwor ICAgICAgICAqIGNvbmZpZy5oOiBJbmNsdWRlIHRoZSBjb25maWd1cmF0aW9uIGhlYWRlciBnZW5l cmF0ZWQgYnkgYXV0b3Rvb2xzIGlmCisgICAgICAgIGF2YWlsYWJsZS4KKwogMjAwOC0wOC0yOCAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgTWFjaWVqLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9jb25maWcuaCBiL1dlYkNvcmUvY29uZmln LmgKaW5kZXggNjQwMjVmNy4uYzVkZmQ0MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jb25maWcuaAor KysgYi9XZWJDb3JlL2NvbmZpZy5oCkBAIC0xOCw2ICsxOCwxMCBAQAogICoKICAqLwogCisjaWYg SEFWRV9DT05GSUdfSAorI2luY2x1ZGUgImF1dG90b29sc2NvbmZpZy5oIgorI2VuZGlmCisKICNp bmNsdWRlIDx3dGYvUGxhdGZvcm0uaD4KIAogI2RlZmluZSBNT0JJTEUgMApkaWZmIC0tZ2l0IGEv Y29uZmlndXJlLmFjIGIvY29uZmlndXJlLmFjCmluZGV4IDIxZjcyNjYuLjU3OTg5MWMgMTAwNjQ0 Ci0tLSBhL2NvbmZpZ3VyZS5hYworKysgYi9jb25maWd1cmUuYWMKQEAgLTYsNyArNiw3IEBAIG00 X2RlZmluZShbd2Via2l0X21pY3JvX3ZlcnNpb25dLCBbMl0pCiAKIEFDX0lOSVQoW1dlYktpdF0s W3dlYmtpdF9tYWpvcl92ZXJzaW9uLndlYmtpdF9taW5vcl92ZXJzaW9uLndlYmtpdF9taWNyb192 ZXJzaW9uXSxbaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9dKQogCi1BQ19DT05GSUdfSEVBREVSUyhb YWNvbmZpZy5oXSkKK0FDX0NPTkZJR19IRUFERVJTKFthdXRvdG9vbHNjb25maWcuaF0pCiAKIFdF QktJVF9NQUpPUl9WRVJTSU9OPXdlYmtpdF9tYWpvcl92ZXJzaW9uCiBXRUJLSVRfTUlOT1JfVkVS U0lPTj13ZWJraXRfbWlub3JfdmVyc2lvbgo=