Re: [gnome-network][PATCH] Update configure.in to summarize what will be built

[Mason Kidd <mason_kidd mrkidd com>]

On Mon, 2004-01-05 at 08:50, Germán Poó Caamaño wrote:
> El lun, 05-01-2004 a las 12:50, Mason Kidd escribió:
> > On Mon, 2004-01-05 at 06:12, Germán Poó Caamaño wrote:
> > > El dom, 04-01-2004 a las 22:47, Mason Kidd escribió:
> > > > Hi everybody,
> > > > The attached patch updates configure.in to summarize at the end of the
> > > > configure script output, what components of gnome-network will be
> > > > built.  It also separates out a little better the checks for required
> > > > libs for each component, and allows disabling the building of individual
> > > > components (i.e. --disable-pws to not build the Personal Web Server).
> > > 
> > > May you update your patch with the current CVS?
> > > 
> > > Thanks,
> > No problem.  Updated patch is attached.
> 
> It looks ok, but it just missing a Changelog entry.  Could you add one?
> 
> Thanks,
Heh, I'll get this right eventually. :)

Attached is a new patch.

Mason Kidd

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-network/ChangeLog,v
retrieving revision 1.98
diff -u -r1.98 ChangeLog
--- ChangeLog	4 Jan 2004 22:06:46 -0000	1.98
+++ ChangeLog	6 Jan 2004 02:43:17 -0000
@@ -1,3 +1,10 @@
+2004-01-05  Mason Kidd <mrkidd mrkidd com>
+
+	* configure.in, Makefile.am, desktop/Makefile.am: Added ability to
+	disable	building of individual modules, added summarization of 
+	modules that will be built at end of configure script, clean up 
+	checks for components.
+	
 2004-01-04  Rodrigo Moya <rodrigo gnome-db org>
 
 	* configure.in: removed dependency on ZVT, only needed for the
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-network/Makefile.am,v
retrieving revision 1.34
diff -u -r1.34 Makefile.am
--- Makefile.am	23 Oct 2003 23:42:37 -0000	1.34
+++ Makefile.am	6 Jan 2004 02:43:17 -0000
@@ -1,10 +1,22 @@
-if HAVE_LIBCHEROKEE
+if WITH_PWS
 pwsdir = pws
 else
 pwsdir =
 endif
 
-SUBDIRS = po network-utilities desktop gnome-netinfo $(pwsdir)
+if WITH_NETINFO
+netinfodir = gnome-netinfo
+else
+netinfodir =
+endif
+
+if WITH_NETWORKUTIL
+networkutildir = network-utilities
+else
+networkutildir =
+endif
+
+SUBDIRS = po $(networkutildir) desktop $(netinfodir) $(pwsdir)
 
 EXTRA_DIST = gnome-network.spec.in \
         intltool-extract.in \
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-network/configure.in,v
retrieving revision 1.111
diff -u -r1.111 configure.in
--- configure.in	4 Jan 2004 22:06:47 -0000	1.111
+++ configure.in	6 Jan 2004 02:43:17 -0000
@@ -22,6 +22,15 @@
 GNOME_COMPILE_WARNINGS(yes)
 CFLAGS="$CFLAGS $WARN_CFLAGS"
 
+PKG_CHECK_MODULES(GNETWORK, libgnomeui-2.0 libgnome-2.0 gtk+-2.0 glib-2.0 libglade-2.0 gconf-2.0)
+AC_SUBST(GNETWORK_CFLAGS)
+AC_SUBST(GNETWORK_LIBS)
+
+PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0, have_libpanelapplet=yes, have_libpanelapplet=no)
+AM_CONDITIONAL(HAVE_LIBPANELAPPLET, test "x$have_libpanelapplet" = "xyes")
+AC_SUBST(APPLET_CFLAGS)
+AC_SUBST(APPLET_LIBS)
+
 dnl Checks for gnome-sync.
 AC_CHECK_HEADER(limits.h)
 AC_C_BIGENDIAN
@@ -35,31 +44,28 @@
 
 dnl check for rfb (libvncserver) headers.  It could cleaner if libvncserver would
 dnl provide PGK_CONFIG checks.
-AC_PATH_PROG(LIBVNC, libvncserver-config, no)
-
-if test "x$LIBVNC" != "xno"; then
-	VNC_CFLAGS=`libvncserver-config --cflags`
-	VNC_LIBS=`libvncserver-config --libs`
+ 
+AC_ARG_ENABLE(desktopsharing, AC_HELP_STRING([--disable-desktopsharing],
+                [Build the Desktop Sharing module (default: enabled)]))
+if test "x$enable_desktopsharing" = "xno"; then
+        echo "Not building the Desktop Sharing module"
+else
+        enable_desktopsharing=yes
+        AC_PATH_PROG(LIBVNC, libvncserver-config, no)
+        if test "x$LIBVNC" = "xno"; then
+                enable_desktopsharing=no
+                echo "Not building the Desktop Sharing module (requires libvncserver"
+        else
+                enable_desktopsharing=yes
+                VNC_CFLAGS=`libvncserver-config --cflags`
+                VNC_LIBS=`libvncserver-config --libs`
+                AC_SUBST(VNC_CFLAGS)
+                AC_SUBST(VNC_LIBS)
+                echo "Build the Desktop Sharing Module"
+        fi
 fi
+AM_CONDITIONAL(WITH_DESKTOPSHARING, test "x$enable_desktopsharing" = "xyes")
 
-AM_CONDITIONAL(RFB, test "x$LIBVNC" != "xno")
-
-AC_SUBST(VNC_CFLAGS)
-AC_SUBST(VNC_LIBS)
-
-dnl PKG_CHECK_MODULES(ZVT, libzvt-2.0, have_zvt=yes, have_zvt=no)
-dnl AM_CONDITIONAL(HAVE_LIBZVT, test "x$have_zvt" = "xyes")
-dnl AC_SUBST(ZVT_CFLAGS)
-dnl AC_SUBST(ZVT_LIBS)
-
-PKG_CHECK_MODULES(GNETWORK, libgnomeui-2.0 libgnome-2.0 gtk+-2.0 glib-2.0 libglade-2.0 gconf-2.0)
-AC_SUBST(GNETWORK_CFLAGS)
-AC_SUBST(GNETWORK_LIBS)
-
-PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0, have_libpanelapplet=yes, have_libpanelapplet=no)
-AM_CONDITIONAL(HAVE_LIBPANELAPPLET, test "x$have_libpanelapplet" = "xyes")
-AC_SUBST(APPLET_CFLAGS)
-AC_SUBST(APPLET_LIBS)
 
 dnl Find ifconfig
 dnl
@@ -115,10 +121,54 @@
 
 dnl Find libcherokee
 dnl
-PKG_CHECK_MODULES(LIBCHEROKEE, cherokee >= 0.4.6, have_libcherokee=yes, have_libcherokee=no)
-AM_CONDITIONAL(HAVE_LIBCHEROKEE, test "x$have_libcherokee" = "xyes")
-AC_SUBST(LIBCHEROKEE_CFLAGS)
-AC_SUBST(LIBCHEROKEE_LIBS)
+AC_ARG_ENABLE(pws, AC_HELP_STRING([--disable-pws],
+		[Build the Personal Web Server module (default: enabled)]))
+if test "x$enable_pws" = "xno"; then
+	echo "Not building Personal Web Server module"
+else
+	enable_pws=yes
+	PKG_CHECK_MODULES(LIBCHEROKEE, cherokee >= 0.4.6, have_libcherokee=yes, have_libcherokee=no)
+	if test "x$have_libcherokee" = "xno"; then
+		enable_pws=no
+		echo "Not building Personal Web Server module (requires libcherokee)"
+	else
+dnl		AM_CONDITIONAL(HAVE_LIBCHEROKEE, test "x$have_libcherokee" = "xyes")
+		AC_SUBST(LIBCHEROKEE_CFLAGS)
+		AC_SUBST(LIBCHEROKEE_LIBS)
+		echo "Building Personal Web Server module"
+	fi
+fi
+AM_CONDITIONAL(WITH_PWS, test "x$enable_pws" = "xyes")
+
+AC_ARG_ENABLE(netinfo, AC_HELP_STRING([--disable-netinfo],
+		[Build the Network Information module (default: enabled)]))
+if test "x$enable_netinfo" = "xno"; then
+	echo "Not building Network Information module"
+else
+	enable_netinfo=yes
+	echo "Building Network Information module"
+fi
+AM_CONDITIONAL(WITH_NETINFO, test "x$enable_netinfo" = "xyes")
+
+AC_ARG_ENABLE(networkutil, AC_HELP_STRING([--disable-networkutil],
+		[Build the Network Utilities module (default: enabled)]))
+if test "x$enable_networkutil" = "xno"; then
+	echo "Not building Network Utilities module"
+else
+	enable_networkutil=yes
+	echo "Building Network Utilities module"
+fi
+AM_CONDITIONAL(WITH_NETWORKUTIL, test "x$enable_networkutil" = "xyes")
+
+AC_ARG_ENABLE(rdclient, AC_HELP_STRING([--disable-rdclient],
+		[Build the Remote Desktop Client module (default: enabled)]))
+if test "x$enable_rdclient" = "xno"; then
+	echo "Not building the Remote Desktop Client module"
+else
+	enable_rdclient=yes
+	echo "Building the Remote Desktop Client module"
+fi
+AM_CONDITIONAL(WITH_RDCLIENT, test "x$enable_rdclient" = "xyes")
 
 dnl Check gconftool
 dnl
@@ -180,3 +230,20 @@
 desktop/server/Makefile
 gnome-netinfo/Makefile
 pws/Makefile])
+
+AC_MSG_NOTICE([The following modules will be built:])
+if test "x$enable_desktopsharing" != "xno"; then
+	AC_MSG_NOTICE([     Desktop Sharing])
+fi
+if test "x$enable_pws" != "xno"; then
+	AC_MSG_NOTICE([     Personal Web Server])
+fi
+if test "x$enable_netinfo" != "xno"; then
+	AC_MSG_NOTICE([     Network Information])
+fi
+if test "x$enable_networkutil" != "xno"; then
+	AC_MSG_NOTICE([     Network Utilities])
+fi
+if test "x$enable_rdclient" != "xno"; then
+	AC_MSG_NOTICE([     Remote Desktop Client])
+fi
Index: desktop/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-network/desktop/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- desktop/Makefile.am	25 Nov 2003 18:14:06 -0000	1.8
+++ desktop/Makefile.am	6 Jan 2004 02:43:17 -0000
@@ -1,7 +1,13 @@
-if RFB
-SERVER_DIRS = data server preferences
+if WITH_DESKTOPSHARING
+serverdir = data server preferences
 else
-SERVER_DIRS =
+serverdir =
 endif
 
-SUBDIRS = client $(SERVER_DIRS)
+if WITH_RDCLIENT
+rdclientdir = client
+else
+rdclientdir = 
+endif
+
+SUBDIRS = $(rdclientdir) $(serverdir)