aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.in27
-rw-r--r--embed/mozilla/Makefile.am5
3 files changed, 35 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 724b59d47..b3abd4afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-04 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * configure.in:
+ * embed/mozilla/Makefile.am:
+
+ Use mozilla-config.h instead of hacks.
+
2003-04-01 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/ephy-autocompletion.c:
diff --git a/configure.in b/configure.in
index 7e252255e..265ae5b48 100644
--- a/configure.in
+++ b/configure.in
@@ -142,6 +142,33 @@ fi
AM_GCONF_SOURCE_2
+dnl This is from Mozilla's configure.in. They set almost all the config stuff
+dnl they need in mozilla-config.h Except for this compiler flag, which can't
+dnl go in mozilla-config.h So we check the flag too and now we can include
+dnl mozilla-config.h without breaking galeon.
+dnl This is really gcc-only
+dnl Do this test using CXX only since some versions of gcc
+dnl 2.95-2.97 have a signed wchar_t in c++ only and some versions
+dnl only have short-wchar support for c++.
+AC_LANG_PUSH(C++)
+_SAVE_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS -fshort-wchar"
+
+AC_CACHE_CHECK(for compiler -fshort-wchar option,
+ ac_cv_have_usable_wchar_option,
+ [AC_TRY_RUN([#include <stddef.h>
+ int main () {
+ return (sizeof(wchar_t) != 2) ||
+ (wchar_t)-1 < (wchar_t) 0 ; } ],
+ ac_cv_have_usable_wchar_option="yes",
+ ac_cv_have_usable_wchar_option="no",
+ ac_cv_have_usable_wchar_option="maybe")])
+
+if test "$ac_cv_have_usable_wchar_option" != "yes"; then
+ CXXFLAGS=$_SAVE_CXXFLAGS
+fi
+AC_LANG_POP(C++)
+
dnl *******************************
dnl Internationalization
dnl *******************************
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index e3e138c8b..1db481fba 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -1,6 +1,3 @@
-#MOZILLA_ACDEFINES = -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
-MOZILLA_ACDEFINES=-DNEW_H=\<new\>
-
INCLUDES = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/embed \
@@ -49,7 +46,7 @@ INCLUDES = \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
-DSHARE_DIR=\"$(pkgdatadir)\" \
- $(MOZILLA_ACDEFINES)
+ -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
noinst_LTLIBRARIES = libephymozillaembed.la