From dd09eea8a02dccd00fb2b39d251a3b1cc532e51d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 5 Mar 2002 16:36:57 +0000 Subject: [PATCH] mention gimp-remote in the error message if Xmu was not found. 2002-03-05 Michael Natterer * 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. --- ChangeLog | 9 +++++++++ configure.in | 6 +++--- plug-ins/webbrowser/Makefile.am | 1 - tools/Makefile.am | 1 - 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d369af710e..b02d4a360b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-03-05 Michael Natterer + + * 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 * configure.in: Add X_LIBS to LDFLAGS while checking for diff --git a/configure.in b/configure.in index 2bdfe21329..4bace6f437 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/plug-ins/webbrowser/Makefile.am b/plug-ins/webbrowser/Makefile.am index b6f60a27c5..312c960cd6 100644 --- a/plug-ins/webbrowser/Makefile.am +++ b/plug-ins/webbrowser/Makefile.am @@ -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@ diff --git a/tools/Makefile.am b/tools/Makefile.am index 749eadc460..3ebf1e918c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -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@