[evolution-patches] Gnome Pilot Fixes

[Rodney Dawes <dobey ximian com>]

This patch makes it possible to optionally build the panel applet.
It also fixes autoheader complaining about the AC_DEFINE() stuff
when you remove acconfig.h to get rid of the warning it spits out.
I had to do this in order to test the patch to make the applet be
optional.

-- dobey

? autom4te.cache
? docklet
? stamp-h1
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-pilot/configure.in,v
retrieving revision 1.177
diff -u -r1.177 configure.in
--- configure.in	19 May 2003 12:11:52 -0000	1.177
+++ configure.in	9 Jun 2003 22:37:30 -0000
@@ -72,10 +72,10 @@
 ])
 
 if test x"$do_usb" = xyes ; then
-	AC_DEFINE(WITH_USB_VISOR)
+	AC_DEFINE(WITH_USB_VISOR,, "With USB Visor Support")
 fi
 
-AC_DEFINE(WITH_IRDA)
+AC_DEFINE(WITH_IRDA,,"With IrDA Support")
 
 AC_ARG_ENABLE([network], [  --enable-network     Enable support for network synchronization],[
 	do_network=$enableval
@@ -84,7 +84,7 @@
 ])
 
 if test x"$do_network" = xyes ; then
-	AC_DEFINE(WITH_NETWORK)
+	AC_DEFINE(WITH_NETWORK,,"With Network Sync Support")
 fi
 
 dnl ******************************
@@ -93,7 +93,7 @@
 AC_ARG_WITH(vfs, [   --with-vfs              Enable GNOME vfs.], [do_vfs=$withval], [do_vfs=yes])
 if test x"$do_vfs" = xyes; then
 	GNOMEVFS_REQUIRED="gnome-vfs-2.0 >= 2.0.0"
-	AC_DEFINE(WITH_VFS)
+	AC_DEFINE(WITH_VFS,,"With GNOME VFS Support")
 fi
 
 dnl ******************************
@@ -116,7 +116,6 @@
 	$LIBBONOBO_REQUIRED
 	$ORBIT_REQUIRED
 	$BONOBO_ACTIVATION_REQUIRED
-	$LIBPANELAPPLET_REQUIRED
 	$GNOMEVFS_REQUIRED
 	$GCONF_REQUIRED
 ])
@@ -127,6 +126,20 @@
 AC_SUBST(GNOME_PILOT_CFLAGS)
 AC_SUBST(GNOME_PILOT_LIBS)
 
+AC_ARG_ENABLE(panel-applet,[  --enable-panel-applet   Enable the panel applet],
+	[enable_applet="$enableval"],[enable_applet="no"])
+
+if test "x$enable_applet" != "xno"; then
+	PKG_CHECK_MODULES(PILOT_APPLET,
+	[
+		$LIBPANELAPPLET_REQUIRED
+	],[enable_applet=yes],[enable_applet=no])
+fi
+
+AC_SUBST(PILOT_APPLET_CFLAGS)
+AC_SUBST(PILOT_APPLET_LIBS)
+AM_CONDITIONAL(HAVE_PANELAPPLET, test "x$enable_applet" != "xno")
+
 dnl ******************************
 dnl GOB2 Check
 dnl ******************************
@@ -164,12 +177,12 @@
 dnl **************************************************
 GETTEXT_PACKAGE=gnome-pilot
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", "Package name")
 ALL_LINGUAS="am az ca cs cy da de el es fi fr gl he hu ja nl nn no pl pt pt_BR ru sk sv tr uk vi zh_TW" 
 AM_GLIB_GNU_GETTEXT
 
 
-AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps")
+AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", "Icon directory")
 
 dnl Check for lib socket for solaris users.  Do you guys need -lnsl for pisock as well?  Been too long since I used solaris :)
 AC_CHECK_LIB(socket, sendmsg, [LIBS="-lsocket -lnsl"], [])
@@ -181,7 +194,7 @@
 	LIBS="$LIBS -lnsl"
 	;;
 	*linux*)
-	AC_DEFINE(USE_XOPEN_SOURCE)
+	AC_DEFINE(USE_XOPEN_SOURCE,,"Use XOpen Source")
 	;;
 esac
 
@@ -237,5 +250,6 @@
 else
 	echo "          gob          : yes"
 fi
+	echo "          panel applet : $enable_applet"
 	echo "          pilot-link   : $PILOT_LINK_VERSION"
 echo ""
Index: applet/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/applet/Makefile.am,v
retrieving revision 1.35
diff -u -r1.35 Makefile.am
--- applet/Makefile.am	30 Apr 2003 15:37:43 -0000	1.35
+++ applet/Makefile.am	9 Jun 2003 22:37:30 -0000
@@ -1,7 +1,11 @@
 NULL=
 
+if HAVE_PANELAPPLET
+
 libexec_PROGRAMS = gpilot-applet
 
+endif
+
 GOB_BUILT_SRCS = 				\
 	gpilot-applet-progress.c		\
 	gpilot-applet-progress.h		\
@@ -24,6 +28,7 @@
 
 gpilot_applet_LDADD = 				\
 	$(GNOME_PILOT_LIBS)			\
+	$(PILOT_APPLET_LIBS)		\
 	$(top_builddir)/gpilotd/libgpilotd.la
 
 #lib_LTLIBRARIES=libpilot_applet.la
@@ -34,6 +39,7 @@
 INCLUDES = 						\
 	-I$(top_srcdir)					\
 	$(GNOME_PILOT_CFLAGS)				\
+	$(PILOT_APPLET_CFLAGS)			\
 	-DGLADEDATADIR=\""$(gladedir)"\" 		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"