mention gimp-remote in the error message if Xmu was not found.

2002-03-05  Michael Natterer  <mitch@gimp.org>

	* configure.in: mention gimp-remote in the error message if
	Xmu was not found.

	* plug-ins/webbrowser/Makefile.am
	* tools/Makefile.am: removed X_LIBS again because configure adds
	them to LIBXMU now.
This commit is contained in:
Michael Natterer 2002-03-05 16:36:57 +00:00 committed by Michael Natterer
parent eb43dbbf7c
commit dd09eea8a0
4 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,12 @@
2002-03-05 Michael Natterer <mitch@gimp.org>
* configure.in: mention gimp-remote in the error message if
Xmu was not found.
* plug-ins/webbrowser/Makefile.am
* tools/Makefile.am: removed X_LIBS again because configure adds
them to LIBXMU now.
2002-03-05 Michael Natterer <mitch@gimp.org>
* configure.in: Add X_LIBS to LDFLAGS while checking for

View File

@ -409,12 +409,12 @@ if test "$gdk_target" = x11; then
AC_CHECK_LIB(Xmu, XmuClientWindow,
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
WEBBROWSER="webbrowser"; LIBXMU="$X_LIBS -lXmu -lXt -lSM -lICE",
[AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU header file not found) ***)])],
[AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU header file not found) ***)])],
[AC_CHECK_LIB(Xmu, XmuUpdateMapHints,
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
WEBBROWSER="webbrowser"; LIBXMU="$X_LIBS -lXmu -lXt",
[AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU header file not found) ***)])],
AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU library not found) ***), -lXt)], -lXt -lSM -lICE)
[AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU header file not found) ***)])],
AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU library not found) ***), -lXt)], -lXt -lSM -lICE)
LDFLAGS="$gimp_save_LDFLAGS"
fi
else

View File

@ -31,7 +31,6 @@ LDADD = @STRIP_BEGIN@ \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(X_LIBS) \
$(LIBXMU) \
$(INTLLIBS) \
@STRIP_END@

View File

@ -24,7 +24,6 @@ gimp_remote_1_3_SOURCES = gimp-remote.c
gimp_remote_1_3_LDADD = @STRIP_BEGIN@ \
$(GTK_LIBS) \
$(X_LIBS) \
$(LIBXMU) \
@STRIP_END@