aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-05-26 21:38:33 +0800
committerChristian Persch <chpe@src.gnome.org>2005-05-26 21:38:33 +0800
commitfbfbfb22dbb749a0127126ddff9687bffd12a50c (patch)
tree8208b3a7a355ddee5f0546222802159f56a3b8a2
parent84894172d70691e36c5ad914925d8d2a3546a05e (diff)
downloadgsoc2013-epiphany-fbfbfb22dbb749a0127126ddff9687bffd12a50c.tar
gsoc2013-epiphany-fbfbfb22dbb749a0127126ddff9687bffd12a50c.tar.gz
gsoc2013-epiphany-fbfbfb22dbb749a0127126ddff9687bffd12a50c.tar.bz2
gsoc2013-epiphany-fbfbfb22dbb749a0127126ddff9687bffd12a50c.tar.lz
gsoc2013-epiphany-fbfbfb22dbb749a0127126ddff9687bffd12a50c.tar.xz
gsoc2013-epiphany-fbfbfb22dbb749a0127126ddff9687bffd12a50c.tar.zst
gsoc2013-epiphany-fbfbfb22dbb749a0127126ddff9687bffd12a50c.zip
Automatically detect whether we have a mozilla debug build.
2005-05-26 Christian Persch <chpe@cvs.gnome.org> * configure.ac: Automatically detect whether we have a mozilla debug build.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac45
2 files changed, 36 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index de496de6b..00a2152fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-05-26 Christian Persch <chpe@cvs.gnome.org>
+ * configure.ac:
+
+ Automatically detect whether we have a mozilla debug build.
+
+2005-05-26 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/EphyProtocolHandler.cpp:
* embed/mozilla/EphyProtocolHandler.h:
diff --git a/configure.ac b/configure.ac
index 4a289cb47..0880c125f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,18 +108,9 @@ AC_SUBST([LIBBONOBO_IDL])
BONOBO_ACTIVATION_IDL="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
AC_SUBST([BONOBO_ACTIVATION_IDL])
-dnl whether to build with DEBUG defined
-AC_ARG_WITH([mozilla-debug],
- AS_HELP_STRING([--mozilla-debug],[Whether mozilla is a debug build]),
- [AM_CXXFLAGS="-DDEBUG $AM_CXXFLAGS"])
-
-AC_ARG_ENABLE([cpp-rtti],
- AS_HELP_STRING([--enable-cpp-rtti],[Enable C++ RTTI]),[],
- [enable_cpp_rtti=no])
-
-if test "x$enable_cpp_rtti" = "xno"; then
- AM_CXXFLAGS="-fno-rtti $AM_CXXFLAGS"
-fi
+dnl *****
+dnl GConf
+dnl *****
dnl Specify the gconf configuration source,
dnl default to xml::$(sysconfdir)/gconf/gconf.xml.defaults
@@ -165,9 +156,9 @@ if test "x$enable_maintainer_mode" = "xyes"; then
AC_LANG_POP([C])
fi
-dnl ******************
-dnl Mozilla name check
-dnl ******************
+dnl *******
+dnl Mozilla
+dnl *******
AC_MSG_CHECKING([which mozilla to use])
@@ -218,6 +209,14 @@ AC_SUBST(MOZILLA_HOME)
MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA-gtkmozembed`"
AC_SUBST(MOZILLA_PREFIX)
+AC_ARG_ENABLE([cpp-rtti],
+ AS_HELP_STRING([--enable-cpp-rtti],[Enable C++ RTTI]),[],
+ [enable_cpp_rtti=no])
+
+if test "x$enable_cpp_rtti" = "xno"; then
+ AM_CXXFLAGS="-fno-rtti $AM_CXXFLAGS"
+fi
+
dnl *************************************************************************
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
@@ -276,6 +275,22 @@ AC_RUN_IFELSE(
AC_MSG_RESULT([$result])
+dnl Check whether we have a mozilla debug build
+
+AC_MSG_CHECKING([[whether we have a mozilla debug build]])
+
+AC_PREPROC_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#include <mozilla-config.h>
+ #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP)
+ #error No
+ #endif]]
+ )],
+ [AM_CXXFLAGS="-DDEBUG -D_DEBUG $AM_CXXFLAGS" have_mozilla_debug=yes],
+ [have_mozilla_debug=no])
+
+AC_MSG_RESULT([$have_mozilla_debug])
+
dnl Determine gecko version
dnl We don't use the version from the .pc file, since that's the app version
dnl and not the Gecko version