Index: configure.in
===================================================================
RCS file: /cvs/gnome/beagle/configure.in,v
retrieving revision 1.103
diff -u -B -p -r1.103 configure.in
--- configure.in	1 Apr 2005 18:05:29 -0000	1.103
+++ configure.in	1 Apr 2005 18:15:55 -0000
@@ -215,53 +215,29 @@ AC_SUBST(LIBTRAYICON_LIBS)
 
 dnl ----------------------------------------------
 
-AC_ARG_ENABLE([evolution-sharp],
-	 AC_HELP_STRING([--disable-evolution-sharp], [Disable evolution-sharp support (default auto)]),
-	 enable_evo_sharp=$enableval,
-	 enable_evo_sharp=auto)
-
-EVOLUTION_SHARP_REQUIRED=0.6
+EVOLUTION_SHARP_REQUIRED_VERSION=0.6
+PKG_CHECK_MODULES(EVO_SHARP,						\
+                  evolution-sharp >= $EVOLUTION_SHARP_REQUIRED_VERSION, \
+                  enable_evo_sharp=yes,					\
+		  enable_evo_sharp=no)
 AC_SUBST(EVO_SHARP_LIBS)
-EVO_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix evolution-sharp`
-
-PKG_CHECK_MODULES(EVO_SHARP,
-   	 evolution-sharp >= $EVOLUTION_SHARP_REQUIRED, \
-	 have_evo_sharp_dependencies=yes,
-	 have_evo_sharp_dependencies=no)
-
-if test "x$have_evo_sharp_dependencies" = "xno"; then
-
-	dnl error out if user has explicitly requested evo-sharp
-	if test "x$enable_evo_sharp" = "xyes"; then
-		AC_MSG_ERROR([Could not find evolution-sharp])
-	fi
 
-	enable_evo_sharp="no (missing dependencies)"
-
-else
-
-	if test "x$enable_evo_sharp" != "xno"; then
-		enable_evo_sharp="yes"
-	else
-		enable_evo_sharp="no (disabled)"
-	fi
+AM_CONDITIONAL(ENABLE_EVO_SHARP, test "x$enable_evo_sharp" = "xyes")
 
-fi
-
-AM_CONDITIONAL(ENABLE_EVO_SHARP, test "x$enable_evo_sharp" == "xyes")
+EVO_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix evolution-sharp`
 
 dnl ----------------------------------------------
 
 AC_ARG_ENABLE([dbus-workarounds],
-	 AC_HELP_STRING ([--disable-dbus-workarounds], [Disable D-BUS Workarounds (default enabled)]),
-	 use_dbus_workarounds=$enableval,
+	[ --disable-dbus-workarounds    Disable D-BUS Workarounds ],
+	 use_dbus_workarounds=no,
 	 use_dbus_workarounds=yes)
 
 dnl ----------------------------------------------
 
 AC_ARG_ENABLE([network],
-        AC_HELP_STRING ([--enable-network], [Enable Network Service (default disabled)]),
-        enable_network=$enableval,
+        [  --enable-network       Enable Network Service ],
+        enable_network=yes,
         enable_network=no)
 
 AM_CONDITIONAL(ENABLE_NETWORK, test "x$enable_network" = "xyes")
@@ -345,9 +321,9 @@ dnl Epiphany Extension
 dnl Much of this is cut&pasted from epiphany-extensions/configure.ac
 
 AC_ARG_ENABLE([epiphany-extension],
-	AC_HELP_STRING([--enable-epiphany-extension], [Enable Epiphany Extension (default auto)]),
+	[  --enable-epiphany-extension   Enable Epiphany Extension ],
 	enable_epiphany_extension=$enableval,
-	enable_epiphany_extension=auto)
+	enable_epiphany_extension=yes)
 
 EPIPHANY_REQUIRED=1.2.1
 LIBXML_REQUIRED=2.6.0
@@ -379,22 +355,11 @@ EPIPHANY_PREFIX="`$PKG_CONFIG --variable
 AC_SUBST(EPIPHANY_PREFIX)
 
 if test "x$have_epiphany_dependencies" = "xno"; then
-
-	dnl error out if user has explicitly requested epiphany extension
-	if test "x$enable_epiphany_extension" = "xyes"; then
-		AC_MSG_ERROR([Could not find epiphany and/or its dependencies])
-	fi
-	
-	enable_epiphany_extension="no (missing dependencies)"
-	
+   enable_epiphany_extension="no (missing dependencies)"
 else
-
-	if test "x$enable_epiphany_extension" != "xno"; then
-		enable_epiphany_extension="yes"
-	else
-		enable_epiphany_extension="no (disabled)"
+	if test "x$enable_epiphany_extension" != "xyes"; then
+	   enable_epiphany_extension="disabled"
 	fi
-
 fi
 
 AM_CONDITIONAL(ENABLE_EPIPHANY_EXTENSION, test "x$enable_epiphany_extension" = "xyes")
@@ -435,8 +400,8 @@ AC_SUBST(CHOOSER_FU_LIBS)
 dnl ----------------------------------------------
 
 AC_ARG_ENABLE([webservices],
-        AC_HELP_STRING([--enable-webservices], [Enable WebServices (default disabled)]),
-        enable_webservices=$enableval,
+        [  --enable-webservices       Enable WebServices],
+        enable_webservices=yes,
         enable_webservices=no)
 
 AM_CONDITIONAL(ENABLE_WEBSERVICES, test "x$enable_webservices" = "xyes")