gimp r26126 - in trunk: . docs

[neo svn gnome org]

Author: neo
Date: Fri Jul 11 13:09:02 2008
New Revision: 26126
URL: http://svn.gnome.org/viewvc/gimp?rev=26126&view=rev

Log:
2008-07-11  Sven Neumann  <sven gimp org>

	* configure.in
	* docs/Makefile.am: made the build of gimp-remote optional and
	disable it by default.

	* INSTALL: document the --enable-gimp-remote configure option.



Modified:
   trunk/ChangeLog
   trunk/INSTALL
   trunk/configure.in
   trunk/docs/Makefile.am

Modified: trunk/INSTALL
==============================================================================
--- trunk/INSTALL	(original)
+++ trunk/INSTALL	Fri Jul 11 13:09:02 2008
@@ -230,6 +230,10 @@
      gimp-console binary to be built in addition to the standard binary.
      gimp-console is useful for command-line batch mode or as a server.
 
+  --enable-gimp-remote.  Use this option if you want the gimp-remote
+     binary to be built. This only works with X11 and it is obsolete if#
+     your platform has DBus support.
+
   --disable-python.  If for some reason you don't want to build the
      Python based pygimp plug-in, you can use --disable-python.
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jul 11 13:09:02 2008
@@ -888,16 +888,25 @@
 	    [Define to 1 to enable support for multiple processors.])
 fi
 
+###################################################
+# gimp-remote is obsolete, but can still be enabled
+###################################################
+
+AC_ARG_ENABLE(gimp-remote,
+	      [  --enable-gimp-remote    build gimp-remote utility (default=no)],
+	      enable_gimp_remote=yes,
+	      enable_gimp_remote="no (not enabled)")
+
 
 ################################
 # Some plug-ins are X11 specific
 ################################
 
-GIMP_COMMAND='gimp-gimp_app_version'
-
 # Check if building for GTK+-X11
 gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
 
+have_libxmu="no (building for $gdk_target)"
+
 if test "$gdk_target" = x11; then
 
    # doc-shooter is X11 specific
@@ -912,16 +921,13 @@
    LDFLAGS="$LDFLAGS $X_LIBS"
 
    # Test for Xmu
-   enable_gimp_remote=yes
    if test -z "$LIBXMU"; then
       AC_CHECK_LIB(Xmu, XmuClientWindow,
         [AC_CHECK_HEADERS(X11/Xmu/WinUtil.h,
-          GIMP_REMOTE='gimp-remote-gimp_app_version$(EXEEXT)';
-	  GIMP_COMMAND='gimp-remote-gimp_app_version'
 	  have_libxmu=yes
           LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
-	  [enable_gimp_remote="no (XMU header file not found)"],[#include <gdk/gdkx.h>])],
-	[enable_gimp_remote="no (XMU library not found)"], -lXt -lX11)
+	  [have_libxmu="no (XMU header file not found)"],[#include <gdk/gdkx.h>])],
+	[have_libxmu="no (XMU library not found)"], -lXt -lX11)
       LIBSCREENSHOT="$LIBXMU"
    fi
 
@@ -940,9 +946,6 @@
                 [Define to 1 to if the XFIXES X extension is available])
       LIBSCREENSHOT="$LIBSCREENSHOT $XFIXES_LIBS",
       true)
-
-else
-   enable_gimp_remote="no (building for $gdk_target)"
 fi
 
 AC_SUBST(LIBXMU)
@@ -950,7 +953,21 @@
 
 AC_SUBST(DOC_SHOOTER)
 
+
+if test x"$enable_gimp_remote" = xyes; then
+  enable_gimp_remote="$have_libxmu"
+fi
+
+if test x"$enable_gimp_remote" = xyes; then
+  GIMP_REMOTE='gimp-remote-gimp_app_version$(EXEEXT)'
+  GIMP_REMOTE_MANPAGE='gimp-remote-gimp_app_version.1'
+  GIMP_COMMAND='gimp-remote-gimp_app_version'
+else
+  GIMP_COMMAND='gimp-gimp_app_version'
+fi
+
 AC_SUBST(GIMP_REMOTE)
+AC_SUBST(GIMP_REMOTE_MANPAGE)
 AC_SUBST(GIMP_COMMAND)
 
 

Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am	(original)
+++ trunk/docs/Makefile.am	Fri Jul 11 13:09:02 2008
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = \
+	gimp-remote.1.in		\
 	Wilber.xcf.gz			\
 	Wilber.xcf.gz.README		\
 	Wilber_Construction_Kit.xcf.gz
@@ -8,7 +9,7 @@
 mans = \
 	gimp-$(GIMP_APP_VERSION).1	\
 	gimprc-$(GIMP_APP_VERSION).5	\
-	gimp-remote-$(GIMP_APP_VERSION).1
+	$(GIMP_REMOTE_MANPAGE)
 
 man_MANS = \
 	$(mans)				\