diff options
| author | Christian Persch <chpe@gnome.org> | 2007-07-17 04:12:58 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-07-17 04:12:58 +0800 |
| commit | a8371ea0c611812d579611294b97003a6f61098e (patch) | |
| tree | b488741a3332411d67fbdc80e1c39b8064df8b64 /configure.ac | |
| parent | 8c0a1d2d985e6d34e8a78384cdad6dd82db3d55f (diff) | |
| download | gsoc2013-epiphany-a8371ea0c611812d579611294b97003a6f61098e.tar.gz gsoc2013-epiphany-a8371ea0c611812d579611294b97003a6f61098e.tar.zst gsoc2013-epiphany-a8371ea0c611812d579611294b97003a6f61098e.zip | |
s/MOZILLA/GECKO/g for consistency with gge.
2007-07-16 Christian Persch <chpe@gnome.org>
* configure.ac:
* doc/reference/Makefile.am:
* embed/Makefile.am:
* embed/mozilla/Makefile.am:
* plugins/desktop-file/Makefile.am:
* src/Makefile.am:
s/MOZILLA/GECKO/g for consistency with gge.
svn path=/trunk/; revision=7173
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index c711e016d..ce89be190 100644 --- a/configure.ac +++ b/configure.ac @@ -64,14 +64,14 @@ GNOME_MAINTAINER_MODE_DEFINES MORE_WARN_FLAGS= DEPRECATION_FLAGS= -MOZILLA_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" +GECKO_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" if test "x$enable_maintainer_mode" = "xyes"; then AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour]) enable_debug=yes # -DGTK_DISABLE_DEPRECATED DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" - MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $MOZILLA_WARN_CXXFLAGS" + GECKO_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $GECKO_WARN_CXXFLAGS" fi GLIB_REQUIRED=2.13.4 @@ -168,15 +168,15 @@ fi # Mozilla # ******* -GECKO_INIT([MOZILLA]) +GECKO_INIT([GECKO]) -AC_SUBST([MOZILLA]) -AC_SUBST([MOZILLA_FLAVOUR]) -AC_SUBST([MOZILLA_INCLUDE_ROOT]) -AC_SUBST([MOZILLA_HOME]) -AC_SUBST([MOZILLA_PREFIX]) -AC_SUBST([MOZILLA_EXTRA_LIBS]) -AC_SUBST([MOZILLA_GLUE_LIBS]) +AC_SUBST([GECKO]) +AC_SUBST([GECKO_FLAVOUR]) +AC_SUBST([GECKO_INCLUDE_ROOT]) +AC_SUBST([GECKO_HOME]) +AC_SUBST([GECKO_PREFIX]) +AC_SUBST([GECKO_EXTRA_LIBS]) +AC_SUBST([GECKO_GLUE_LIBS]) if test "$gecko_cv_gecko_version_int" -lt "1008000"; then AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!]) @@ -479,7 +479,7 @@ AC_MSG_RESULT([$enable_desktop_file_plugin]) AM_CONDITIONAL([ENABLE_DESKTOP_FILE_PLUGIN],[test "x$enable_desktop_file_plugin" = "xyes"]) if test "x$enable_desktop_file_plugin" = "xyes"; then - PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[$MOZILLA-xpcom $MOZILLA-plugin gtk+-2.0 >= 2.6.0]) + PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0]) AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS]) AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS]) fi @@ -595,7 +595,7 @@ AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data AM_CPPFLAGS="$AM_CPPFLAGS $DEPRECATION_FLAGS" AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $MORE_WARN_FLAGS" -AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS $MOZILLA_WARN_CXXFLAGS" +AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS $GECKO_WARN_CXXFLAGS" AC_SUBST([AM_CPPFLAGS]) AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CXXFLAGS]) |