From 0774d40cedbde3a4c8751d02e237f7b3b0e25572 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 4 Jul 2003 14:15:49 +0000 Subject: Remove use of acconfig.h. 2003-07-04 Marco Pesenti Gritti * configure.in: Remove use of acconfig.h. * embed/ephy-embed-shell.c: (ephy_embed_shell_get_embed_single): * embed/ephy-embed-single.c: * embed/ephy-embed-single.h: * embed/mozilla/ContentHandler.cpp: * embed/mozilla/EphyWrapper.cpp: * embed/mozilla/Makefile.am: * embed/mozilla/MozRegisterComponents.cpp: * embed/mozilla/MozRegisterComponents.h: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-embed-single.h: * src/bookmarks/ephy-bookmarks-import.c: (bookmark_add), (xbel_parse_folder), (ephy_bookmarks_import_mozilla): * src/ephy-shell.c: (ephy_shell_init): Show an alert when mozilla cant start instead of crashing. Do not import bookmarks dups. Cleanup some mozilla code headers inclusion. --- configure.in | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 572f8cfc1..36f8f8fa8 100644 --- a/configure.in +++ b/configure.in @@ -54,31 +54,12 @@ if test "x$enable_nautilus_view" = "xauto"; then fi fi if test "x$enable_nautilus_view" = "xyes"; then - AC_DEFINE(ENABLE_NAUTILUS_VIEW) + AC_DEFINE(ENABLE_NAUTILUS_VIEW, 1, [Define if the nautilus view has to be built]) nautilusview_pkgs=libnautilus fi AC_MSG_RESULT($enable_nautilus_view) AM_CONDITIONAL(ENABLE_NAUTILUS_VIEW, test "x$enable_nautilus_view" = "xyes") -dnl See if nautilus is installed in other prefix than epiphany so that we can load -dnl nautilus throbbers even then. -dnl Maybe FIXME: make this check not require libnautilus.pc -dnl -nautilus_prefix=`pkg-config --variable=prefix libnautilus 2> /dev/null` -if test "x${nautilus_prefix}" != "x"; then - if test "x${prefix}" = "xNONE"; then - epiphany_prefix="${ac_default_prefix}" - else - epiphany_prefix="${prefix}" - fi - - dnl We already search for nautilus throbbers in epiphany prefix, don't add the - dnl same directory or we'd show the throbbers twice. - if test "x${nautilus_prefix}" != "x${epiphany_prefix}"; then - AC_DEFINE_UNQUOTED(NAUTILUS_PREFIX, "${nautilus_prefix}") - fi -fi - PKG_CHECK_MODULES(EPIPHANY_DEPENDENCY, gtk+-2.0 libxml-2.0 libgnomeui-2.0 libglade-2.0 bonobo-activation-2.0 libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED ORBit-2.0 libglade-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0 gconf-2.0 $nautilusview_pkgs) AC_SUBST(EPIPHANY_DEPENDENCY_CFLAGS) AC_SUBST(EPIPHANY_DEPENDENCY_LIBS) @@ -93,7 +74,6 @@ BONOBO_ACTIVATION_IDL="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" AC_SUBST(BONOBO_ACTIVATION_IDL) PKG_CHECK_MODULES(MOZILLA_COMPONENT, mozilla-gtkmozembed) -dnl AC_DEFINE(ENABLE_MOZILLA_EMBED) AC_SUBST(MOZILLA_COMPONENT_CFLAGS) AC_SUBST(MOZILLA_COMPONENT_LIBS) @@ -200,7 +180,7 @@ dnl Add the languages which your application supports here. ALL_LINGUAS="am ar be ca cs da de el en_GB es fr hu ja ko li nl mk ms no pl pt pt_BR ru sr sr@Latn sv tr vi zh_TW" GETTEXT_PACKAGE=epiphany AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) AM_GLIB_GNU_GETTEXT dnl uninstalled share dir to search data -- cgit v1.2.3