From 6a2e32f69ec09bc07107406f658ca54a64da5396 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sat, 15 Jul 2000 00:51:49 +0000 Subject: [PATCH] added pt_BR to ALL_LINGUAS 2000-07-15 Sven Neumann * configure.in: added pt_BR to ALL_LINGUAS * tools/Makefile.am: only build gimp-remote if libXmu is available. Added a target for kernelgen while I was on it. --- ChangeLog | 8 ++++++++ configure.in | 13 +++++++------ tools/Makefile.am | 16 ++++++++++------ tools/kernelgen.c | 2 ++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09769d14ee..de8d58b072 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-07-15 Sven Neumann + + * configure.in: added pt_BR to ALL_LINGUAS + + * tools/Makefile.am: only build gimp-remote if libXmu + is available. Added a target for kernelgen while I was + on it. + 2000-07-15 Sven Neumann * tools/Makefile.am: build gimp-remote diff --git a/configure.in b/configure.in index 23ed8c07af..83a15cf7a9 100644 --- a/configure.in +++ b/configure.in @@ -91,7 +91,7 @@ fi dnl i18n stuff -ALL_LINGUAS="ca cs da de en_GB es fi fr gl hu it ja ko nl no pl ru sk sv uk" +ALL_LINGUAS="ca cs da de en_GB es fi fr gl hu it ja ko nl no pl pt_BR ru sk sv uk" AM_GNU_GETTEXT @@ -182,13 +182,13 @@ dnl Test for Xmu if test -z "$LIBXMU"; then AC_CHECK_LIB(Xmu, XmuClientWindow, AC_CHECK_HEADER(X11/Xmu/WinUtil.h, - WEBBROWSER="webbrowser"; LIBXMU='-lXmu -lXt -lSM -lICE', - AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU header file not found) ***)), + WEBBROWSER="webbrowser"; GIMP_REMOTE="gimp-remote"; LIBXMU='-lXmu -lXt -lSM -lICE', + 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='-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) + WEBBROWSER="webbrowser"; GIMP_REMOTE="gimp-remote"; LIBXMU='-lXmu -lXt', + 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) fi dnl Test for libaa @@ -693,6 +693,7 @@ AC_SUBST(brushdata) AC_SUBST(gradientdata) AC_SUBST(palettedata) AC_SUBST(patterndata) +AC_SUBST(GIMP_REMOTE) AC_SUBST(WEBBROWSER) AC_SUBST(LIBXMU) AC_SUBST(TIFF) diff --git a/tools/Makefile.am b/tools/Makefile.am index 3211aeaddc..55969f4aed 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -4,17 +4,23 @@ else D_pdbgen= endif -bin_PROGRAMS = gimp-remote +bin_PROGRAMS = $(GIMP_REMOTE) + +EXTRA_PROGRAMS = \ + gimp-remote \ + kernelgen gimp_remote_SOURCES = gimp-remote.c gimp_remote_LDADD = \ $(GTK_LIBS) \ - -lXmu + $(LIBXMU) + +kernelgen_SOURCES = kernelgen.c INCLUDES = \ - -I$(top_srcdir) \ - $(GTK_CFLAGS) \ + -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) #if WITH_GCG @@ -24,5 +30,3 @@ INCLUDES = \ #endif SUBDIRS = $(D_pdbgen) #$(D_gcg) - -EXTRA_DIST = kernelgen.c diff --git a/tools/kernelgen.c b/tools/kernelgen.c index 8ac8c256d4..e80c7d7797 100644 --- a/tools/kernelgen.c +++ b/tools/kernelgen.c @@ -116,6 +116,8 @@ main (int argc, } printf ("};\n"); + + exit (0); }