Index: configure.in
===================================================================
RCS file: /cvs/gnome/yelp/configure.in,v
retrieving revision 1.193
diff -p -u -u -p -r1.193 configure.in
--- configure.in	7 Nov 2005 22:44:44 -0000	1.193
+++ configure.in	22 Nov 2005 20:00:31 -0000
@@ -3,8 +3,9 @@ AC_INIT([yelp], [2.12.1],
 
 GNOME_COMMON_INIT
 
-AC_CONFIG_SRCDIR(src/yelp-main.c)
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_SRCDIR([src/yelp-main.c])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
@@ -134,73 +135,36 @@ fi
 AC_SUBST([YELP_SEARCH_CFLAGS])
 AC_SUBST([YELP_SEARCH_LIBS])
 
-dnl *******
-dnl Mozilla
-dnl *******
-
-AC_MSG_CHECKING([which gecko to use])
-
-AC_ARG_WITH([mozilla],
-	AS_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|xulrunner|thunderbird@:>@],
-		       [Which gecko engine to use (default: autodetect)]))
-
-GECKOS="firefox mozilla-firefox seamonkey mozilla xulrunner thunderbird mozilla-thunderbird"
-gecko=$with_mozilla
-
-if test "x$gecko" = "x"; then
-	dnl Autodetect gecko
-	for g in $GECKOS; do
-		if $PKG_CONFIG --exists $g-xpcom; then
-			gecko=$g
-			break;
-		fi
-	done
-fi
-
-if test "x$gecko" = "x"; then
-	AC_MSG_ERROR([No gecko found])
-elif ! ( echo "$GECKOS" | egrep "(^| )$gecko(\$| )" > /dev/null); then
-	AC_MSG_ERROR([Unknown gecko "$gecko" specified])
-fi
-
-AC_MSG_RESULT([$gecko])
-
-case "$gecko" in
-mozilla) min_version=1.7 flavour=mozilla ;;
-seamonkey) min_version=1.0 flavour=mozilla ;;
-*firefox) min_version=1.0 flavour=toolkit ;;
-*thunderbird) min_version=1.0 flavour=toolkit ;;
-xulrunner) min_version=1.8 flavour=toolkit ;;
-esac
+dnl =====
+dnl Gecko
+dnl =====
 
-MOZILLA=$gecko
-AC_SUBST([MOZILLA])
+GECKO_INIT([MOZILLA])
 
-PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed)
+AC_SUBST([MOZILLA])
+AC_SUBST([MOZILLA_INCLUDE_ROOT])
+AC_SUBST([MOZILLA_HOME])
 
-MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`"
-AC_SUBST(MOZILLA_INCLUDE_ROOT)
+case "$MOZILLA" in
+mozilla) gecko_min_version=1.7 ;;
+seamonkey) gecko_min_version=1.0 ;;
+*firefox) gecko_min_version=1.0 ;;
+*thunderbird) gecko_min_version=1.0 ;;
+xulrunner) gecko_min_version=1.8 ;;
+esac
 
-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`"
-AC_SUBST(MOZILLA_HOME)
+PKG_CHECK_MODULES([MOZILLA_COMPONENT],[$MOZILLA-gtkmozembed >= $gecko_min_version])
 
 dnl Needed since gecko 1.8b2
 AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define to have access to internal Mozilla APIs])
 
-AC_ARG_ENABLE([cpp-rtti],
-              AC_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
-
 AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/fastfind/nsITypeAheadFind.h],
 	[AC_DEFINE([TYPEAHEADFIND],[1],[Define if we have toolkit's nsITypeAheadFind])])
 
-AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define to have access to internal mozilla APIs])
-
+dnl =================
 dnl Check for whereis
+dnl =================
+
 case $host in
   *-linux-gnu | *-irix6*) AC_DEFINE(HAVE_MAN_WHEREIS, 1, [man(1)  understands -w option]);;
   *-solaris*) AC_DEFINE(HAVE_MAN_DEBUG, 1, [man(1) has a -d debug option]);;
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/yelp/Makefile.am,v
retrieving revision 1.12
diff -p -u -u -p -r1.12 Makefile.am
--- Makefile.am	28 Oct 2004 15:25:54 -0000	1.12
+++ Makefile.am	22 Nov 2005 20:00:31 -0000
@@ -1,5 +1,7 @@
 SUBDIRS = src stylesheets po data
 
+ACLOCAL_AMFLAGS = -I m4
+
 @INTLTOOL_DESKTOP_RULE@
 
 DESKTOP_IN_FILES=yelp.desktop.in
