graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-19 06:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up the check for Xmu. Include <gdk/gdkx.h> when testing for Xmu.h.

Browse source 
2004-04-12  Sven Neumann  <sven@gimp.org>

	* configure.in: cleaned up the check for Xmu. Include <gdk/gdkx.h>
	when testing for Xmu.h. Fixes bug #139803.
This commit is contained in:
Sven Neumann 2004-04-12 18:25:57 +00:00 committed by Sven Neumann
parent 542d6de9e8
commit 4be2336398
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-04-12 Sven Neumann <sven@gimp.org>
* configure.in: cleaned up the check for Xmu. Include <gdk/gdkx.h>
when testing for Xmu.h. Fixes bug #139803.
2004-04-12 Sven Neumann <sven@gimp.org> 2004-04-12 Sven Neumann <sven@gimp.org>
* libgimpmath/Makefile.am: remove test-md5 on make clean. * libgimpmath/Makefile.am: remove test-md5 on make clean.

14
configure.in
View file

@ -820,21 +820,15 @@ if test "$gdk_target" = x11; then
if test -z "$LIBXMU"; then if test -z "$LIBXMU"; then
gimp_save_CFLAGS="$CFLAGS" gimp_save_CFLAGS="$CFLAGS"
gimp_save_LDFLAGS="$LDFLAGS" gimp_save_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS" LDFLAGS="$LDFLAGS $X_LIBS"
AC_CHECK_LIB(Xmu, XmuClientWindow, AC_CHECK_LIB(Xmu, XmuClientWindow,
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h, [AC_CHECK_HEADERS(X11/Xmu/WinUtil.h,
GIMP_REMOTE='gimp-remote-gimp_app_version'; GIMP_REMOTE='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",
[AC_MSG_WARN(*** gimp-remote will not be built (XMU header file not found) ***)])], [AC_MSG_WARN(*** gimp-remote will not be built (XMU header file not found) ***)],[#include <gdk/gdkx.h>])],
[AC_CHECK_LIB(Xmu, XmuUpdateMapHints, [AC_MSG_WARN(*** gimp-remote will not be built (XMU library not found) ***)], -lXt)
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
GIMP_REMOTE='gimp-remote-gimp_app_version';
have_libxmu=yes
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
[AC_MSG_WARN(*** gimp-remote will not be built (XMU header file not found) ***)])],
AC_MSG_WARN(*** gimp-remote will not be built (XMU library not found) ***), -lXt)], -lXt)
CFLAGS="$gimp_save_CFLAGS" CFLAGS="$gimp_save_CFLAGS"
LDFLAGS="$gimp_save_LDFLAGS" LDFLAGS="$gimp_save_LDFLAGS"
fi fi