mirror of https://github.com/GNOME/gimp.git
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.
This commit is contained in:
parent
550885cc8a
commit
942c637ca9
|
@ -1,3 +1,12 @@
|
||||||
|
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>
|
2006-12-20 Sven Neumann <sven@gimp.org>
|
||||||
|
|
||||||
* data/tips/gimp-tips.xml.in: changed tip based on a suggestion
|
* data/tips/gimp-tips.xml.in: changed tip based on a suggestion
|
||||||
|
|
|
@ -892,6 +892,8 @@ fi
|
||||||
# Some plug-ins are X11 specific
|
# Some plug-ins are X11 specific
|
||||||
################################
|
################################
|
||||||
|
|
||||||
|
GIMP_COMMAND='gimp-gimp_app_version'
|
||||||
|
|
||||||
dnl Check if building for GTK+-X11
|
dnl Check if building for GTK+-X11
|
||||||
gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
|
gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
|
||||||
if test "$gdk_target" = x11; then
|
if test "$gdk_target" = x11; then
|
||||||
|
@ -911,6 +913,7 @@ if test "$gdk_target" = x11; then
|
||||||
AC_CHECK_LIB(Xmu, XmuClientWindow,
|
AC_CHECK_LIB(Xmu, XmuClientWindow,
|
||||||
[AC_CHECK_HEADERS(X11/Xmu/WinUtil.h,
|
[AC_CHECK_HEADERS(X11/Xmu/WinUtil.h,
|
||||||
GIMP_REMOTE='gimp-remote-gimp_app_version$(EXEEXT)';
|
GIMP_REMOTE='gimp-remote-gimp_app_version$(EXEEXT)';
|
||||||
|
GIMP_COMMAND='gimp-remote-gimp_app_version'
|
||||||
have_libxmu=yes
|
have_libxmu=yes
|
||||||
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
|
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 header file not found)"],[#include <gdk/gdkx.h>])],
|
||||||
|
@ -923,9 +926,12 @@ fi
|
||||||
|
|
||||||
AC_SUBST(LIBXMU)
|
AC_SUBST(LIBXMU)
|
||||||
AC_SUBST(LIBSCREENSHOT)
|
AC_SUBST(LIBSCREENSHOT)
|
||||||
AC_SUBST(GIMP_REMOTE)
|
|
||||||
AC_SUBST(DOC_SHOOTER)
|
AC_SUBST(DOC_SHOOTER)
|
||||||
|
|
||||||
|
AC_SUBST(GIMP_REMOTE)
|
||||||
|
AC_SUBST(GIMP_COMMAND)
|
||||||
|
|
||||||
|
|
||||||
###################
|
###################
|
||||||
# Check for libtiff
|
# Check for libtiff
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
gimp
|
gimp
|
||||||
command=gimp-remote-@GIMP_APP_VERSION@
|
command=@GIMP_COMMAND@
|
||||||
name=GNU Image Manipulation Program
|
name=GNU Image Manipulation Program
|
||||||
can_open_multiple_files=true
|
can_open_multiple_files=true
|
||||||
expects_uris=non-file
|
expects_uris=non-file
|
||||||
|
|
|
@ -5,7 +5,7 @@ Type=Application
|
||||||
_Name=GNU Image Manipulation Program
|
_Name=GNU Image Manipulation Program
|
||||||
_GenericName=Image Editor
|
_GenericName=Image Editor
|
||||||
_Comment=Create images and edit photographs
|
_Comment=Create images and edit photographs
|
||||||
Exec=gimp-remote-@GIMP_APP_VERSION@ %U
|
Exec=@GIMP_COMMAND@ %U
|
||||||
TryExec=gimp-@GIMP_APP_VERSION@
|
TryExec=gimp-@GIMP_APP_VERSION@
|
||||||
Icon=gimp
|
Icon=gimp
|
||||||
Terminal=false
|
Terminal=false
|
||||||
|
|
Loading…
Reference in New Issue