# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1081992015 0
# Node ID 8c4f33ffe17c8753afde818a026dad554cf53def
# Parent  f95edb58087cf24631ce0c5ea9a4ccc645ecf117
[gaim-migrate @ 9417]
Added --disable-gevolution and --disable-startup-notification flags for
configure.

committer: Tailor Script <tailor@pidgin.im>

diff -r f95edb58087c -r 8c4f33ffe17c configure.ac
--- a/configure.ac	Wed Apr 14 12:40:49 2004 +0000
+++ b/configure.ac	Thu Apr 15 01:20:15 2004 +0000
@@ -234,34 +234,49 @@
 	x_incpath_add="-I$x_includes"
 fi
 
-dnl Check for startup notification
-PKG_CHECK_MODULES(STARTUP_NOTIFICATION, libstartup-notification-1.0 >= 0.5,
-[
-	AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.])
-	echo "Building with libstartup-notification"
-	enable_startup_notification=yes
-],
-[
-	echo "Building without libstartup-notification"
-	enable_startup_notification=no
-])
+dnl #######################################################################
+dnl # Check for startup notification
+dnl #######################################################################
+AC_ARG_ENABLE(startup-notification, [  --disable-startup-notification    compile without startup notification support],,enable_startup_notification=yes)
 
-AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
-AC_SUBST(STARTUP_NOTIFICATION_LIBS)
+if test "x$enable_startup_notification" = "xyes"; then
+	PKG_CHECK_MODULES(STARTUP_NOTIFICATION, libstartup-notification-1.0 >= 0.5,
+	[
+		AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.])
+		echo "Building with libstartup-notification"
+		enable_startup_notification=yes
+	],
+	[
+		echo "Building without libstartup-notification"
+		enable_startup_notification=no
+	])
+
+	AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
+	AC_SUBST(STARTUP_NOTIFICATION_LIBS)
+fi
 
 
-dnl Check for stuff needed by the evolution integration plugin.
+dnl #######################################################################
+dnl # Check for stuff needed by the evolution integration plugin.
+dnl #######################################################################
 build_gevo=no
+AC_ARG_ENABLE(gevolution, [  --disable-gevolution    compile without the Gaim-Evolution plugin],,enable_gevolution=yes)
+
+if test "x$enable_gevolution" = "xyes"; then
 
-evo_deps="libxml-2.0 libebook-1.0 libedata-book-1.0"
-PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, build_gevo=yes, build_gevo=no)
+	evo_deps="libxml-2.0 libebook-1.0 libedata-book-1.0"
+	PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, build_gevo=yes, build_gevo=no)
 
-AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
-AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
+	AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
+
+fi
 
 AM_CONDITIONAL(BUILD_GEVOLUTION, test "x$build_gevo" = "xyes")
 
-dnl Check for XScreenSaver
+dnl #######################################################################
+dnl # Check for XScreenSaver
+dnl #######################################################################
 if test "x$enable_xss" = "xyes" ; then
 	old_LIBS="$LIBS"
 	LIBS="$LIBS $GTK_LIBS $x_libpath_add"
@@ -291,7 +306,9 @@
 AC_SUBST(XSS_LIBS)
 
 
-dnl Check for X session management libs
+dnl #######################################################################
+dnl # Check for X session management libs
+dnl #######################################################################
 if test "x$enable_sm" = "xyes"; then
 	enable_sm=no
 	AC_CHECK_LIB(SM, SmcSaveYourselfDone, found_sm_lib=true, , [$x_libpath_add -lICE])
@@ -325,9 +342,9 @@
 GC_TM_GMTOFF
 
 
-dnl
-dnl Perl stuff. Yeah.
-dnl
+dnl #######################################################################
+dnl # Check for Perl support
+dnl #######################################################################
 if test "$enable_perl" = yes ; then
 	AC_PATH_PROG(perlpath, perl)
 	AC_MSG_CHECKING(for Perl compile flags)