Commit 942c637c authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

set variable GIMP_COMMAND depending on whether gimp-remote is being built

2006-12-20  Sven Neumann  <sven@gimp.org>

	* 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.
parent 550885cc
2006-12-20 Sven Neumann <sven@gimp.org>
* 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 <sven@gimp.org>
* data/tips/gimp-tips.xml.in: changed tip based on a suggestion
......@@ -380,7 +389,7 @@
2006-12-06 Sven Neumann <sven@gimp.org>
* 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 <mitch@gimp.org>
......@@ -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().
......
......@@ -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 <gdk/gdkx.h>])],
......@@ -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
......
gimp
command=gimp-remote-@GIMP_APP_VERSION@
command=@GIMP_COMMAND@
name=GNU Image Manipulation Program
can_open_multiple_files=true
expects_uris=non-file
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment