From 942c637ca96b025cd9f3c688d947faf1e58ee833 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 20 Dec 2006 14:30:59 +0000 Subject: [PATCH] set variable GIMP_COMMAND depending on whether gimp-remote is being built 2006-12-20 Sven Neumann * configure.in: set variable GIMP_COMMAND depending on whether gimp-remote is being built or not. * desktop/gimp.applications.in (command) * desktop/gimp.desktop.in.in (Exec): use @GIMP_COMMAND@. Fixes bug #361768. --- ChangeLog | 13 +++++++++++-- configure.in | 8 +++++++- desktop/gimp.applications.in | 2 +- desktop/gimp.desktop.in.in | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e11c9860e..b63677e87e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-12-20 Sven Neumann + + * configure.in: set variable GIMP_COMMAND depending on whether + gimp-remote is being built or not. + + * desktop/gimp.applications.in (command) + * desktop/gimp.desktop.in.in (Exec): use @GIMP_COMMAND@. Fixes + bug #361768. + 2006-12-20 Sven Neumann * data/tips/gimp-tips.xml.in: changed tip based on a suggestion @@ -380,7 +389,7 @@ 2006-12-06 Sven Neumann * plug-ins/common/xpm.c: applied patch by Min Sik Kim. Fixes build - with Quartz GDK backend (bug #382929). + with Quartz GDK backend (bug #382929). 2006-12-06 Michael Natterer @@ -1119,7 +1128,7 @@ * app/dialogs/file-open-location-dialog.c: don't use gimp_dialog_set_sensitive(); just make the entry not editable and the dialog's OK button insensitive. - + * app/widgets/gimpfiledialog.c * app/widgets/gimpwidgets-utils.[ch]: moved gimp_dialog_set_sensitive() implementation into gimp_file_dialog_set_sensitive(). diff --git a/configure.in b/configure.in index 8432993419..facb84ac42 100644 --- a/configure.in +++ b/configure.in @@ -892,6 +892,8 @@ fi # Some plug-ins are X11 specific ################################ +GIMP_COMMAND='gimp-gimp_app_version' + dnl Check if building for GTK+-X11 gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0` if test "$gdk_target" = x11; then @@ -911,6 +913,7 @@ if test "$gdk_target" = x11; 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 ])], @@ -923,9 +926,12 @@ fi AC_SUBST(LIBXMU) AC_SUBST(LIBSCREENSHOT) -AC_SUBST(GIMP_REMOTE) + AC_SUBST(DOC_SHOOTER) +AC_SUBST(GIMP_REMOTE) +AC_SUBST(GIMP_COMMAND) + ################### # Check for libtiff diff --git a/desktop/gimp.applications.in b/desktop/gimp.applications.in index cb984eaa70..70d04b2a13 100644 --- a/desktop/gimp.applications.in +++ b/desktop/gimp.applications.in @@ -1,5 +1,5 @@ gimp - command=gimp-remote-@GIMP_APP_VERSION@ + command=@GIMP_COMMAND@ name=GNU Image Manipulation Program can_open_multiple_files=true expects_uris=non-file diff --git a/desktop/gimp.desktop.in.in b/desktop/gimp.desktop.in.in index 8c901cbd38..2c6bcc59fa 100644 --- a/desktop/gimp.desktop.in.in +++ b/desktop/gimp.desktop.in.in @@ -5,7 +5,7 @@ Type=Application _Name=GNU Image Manipulation Program _GenericName=Image Editor _Comment=Create images and edit photographs -Exec=gimp-remote-@GIMP_APP_VERSION@ %U +Exec=@GIMP_COMMAND@ %U TryExec=gimp-@GIMP_APP_VERSION@ Icon=gimp Terminal=false