On Tue, Mar 06, 2001 at 12:29:26PM +0100, Sven Neumann wrote: > gimp-devel@xxxxxxxxxxxxxxxxxx writes: > > > I submitted patches to resolve the following for 1.2.0 but they were > > not included in 1.2.1. Any chance of them getting merged in? > > Are you sure you submitted them? I have never received an email that > you did (I get the ftp-admin mails and you are supposed to send one > if you upload anything) and I can not remember having seen a patch > like this in incoming. We uploaded again following the instructions ftp spit out to us for ftp://ftp.gimp.org/incoming. Sorry. Our patch against 1.2.0 was posted to this list but not uploaded. > If the patch is not too large, I suggest you include it in an email > and send it to this list. That way everyone can have a look at it, > it's easier to comment it and it will get applied quicker. Attached. Hopefully 23k isn't too large. > PS: IMHO we should change the policy for patches. Handling them via > FTP has never worked that well. Patches should go to the list > (preferably with the word [patch] in the subject) or/and to bugzilla. Why not use SourceForge to manage patches? -- albert chin (china@xxxxxxxxxxxxxxxxxx) -- snip snip --- libgimp/gimpmath.h.orig Wed Jan 24 16:16:45 2001 +++ libgimp/gimpmath.h Wed Jan 24 16:17:13 2001 @@ -24,7 +24,12 @@ #ifndef __GIMPMATH_H__ #define __GIMPMATH_H__ +#ifdef HAVE_MATH_H #include <math.h> +#endif +#ifdef HAVE_IEEEFP_H +#include <ieeefp.h> +#endif #ifdef G_OS_WIN32 #include <float.h> @@ -82,13 +87,19 @@ #define gimp_deg_to_rad(angle) ((angle) * (2.0 * G_PI) / 360.0) #define gimp_rad_to_deg(angle) ((angle) * 360.0 / (2.0 * G_PI)) +#ifdef HAVE_FINITE +#define FINITE(x) finite(x) +#else +#ifdef HAVE_ISFINITE +#define FINITE(x) isfinite(x) +#else #ifdef G_OS_WIN32 #define FINITE(x) _finite(x) #else #ifdef __EMX__ #define FINITE(x) isfinite(x) -#else -#define FINITE(x) finite(x) +#endif +#endif #endif #endif --- plug-ins/dbbrowser/Makefile.am.orig Wed Jan 24 16:55:31 2001 +++ plug-ins/dbbrowser/Makefile.am Wed Jan 24 16:55:31 2001 @@ -16,6 +16,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/script-fu/Makefile.am.orig Wed Jan 24 16:55:35 2001 +++ plug-ins/script-fu/Makefile.am Wed Jan 24 16:55:35 2001 @@ -31,6 +31,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/FractalExplorer/Makefile.am.orig Wed Jan 24 16:55:30 2001 +++ plug-ins/FractalExplorer/Makefile.am Wed Jan 24 16:55:30 2001 @@ -22,6 +22,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/Lighting/Makefile.am.orig Wed Jan 24 16:55:30 2001 +++ plug-ins/Lighting/Makefile.am Wed Jan 24 16:55:30 2001 @@ -30,6 +30,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ -I$(top_srcdir)/plug-ins/libgck \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/MapObject/Makefile.am.orig Wed Jan 24 16:55:30 2001 +++ plug-ins/MapObject/Makefile.am Wed Jan 24 16:55:30 2001 @@ -32,6 +32,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ -I$(top_srcdir)/plug-ins/libgck \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/bmp/Makefile.am.orig Wed Jan 24 16:55:30 2001 +++ plug-ins/bmp/Makefile.am Wed Jan 24 16:55:30 2001 @@ -12,6 +12,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/faxg3/Makefile.am.orig Wed Jan 24 16:55:31 2001 +++ plug-ins/faxg3/Makefile.am Wed Jan 24 16:55:31 2001 @@ -15,6 +15,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GLIB_CFLAGS) \ -I$(includedir) --- plug-ins/fits/Makefile.am.orig Wed Jan 24 16:55:31 2001 +++ plug-ins/fits/Makefile.am Wed Jan 24 16:55:31 2001 @@ -11,6 +11,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/flame/Makefile.am.orig Wed Jan 24 16:55:31 2001 +++ plug-ins/flame/Makefile.am Wed Jan 24 16:55:31 2001 @@ -19,6 +19,7 @@ INCLUDES = \ -DLOCALEDIR=\""$(localedir)"\" \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/fp/Makefile.am.orig Wed Jan 24 16:55:32 2001 +++ plug-ins/fp/Makefile.am Wed Jan 24 16:55:32 2001 @@ -16,6 +16,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/gap/Makefile.am.orig Wed Jan 24 16:55:32 2001 +++ plug-ins/gap/Makefile.am Wed Jan 24 16:55:32 2001 @@ -205,6 +205,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/gdyntext/Makefile.am.orig Wed Jan 24 16:55:32 2001 +++ plug-ins/gdyntext/Makefile.am Wed Jan 24 16:55:32 2001 @@ -48,6 +48,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/gfig/Makefile.am.orig Wed Jan 24 16:55:32 2001 +++ plug-ins/gfig/Makefile.am Wed Jan 24 16:55:33 2001 @@ -17,6 +17,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/gflare/Makefile.am.orig Wed Jan 24 16:55:33 2001 +++ plug-ins/gflare/Makefile.am Wed Jan 24 16:55:33 2001 @@ -18,6 +18,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/gfli/Makefile.am.orig Wed Jan 24 16:55:33 2001 +++ plug-ins/gfli/Makefile.am Wed Jan 24 16:55:34 2001 @@ -11,6 +11,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/gimpressionist/Makefile.am.orig Wed Jan 24 16:55:34 2001 +++ plug-ins/gimpressionist/Makefile.am Wed Jan 24 16:55:34 2001 @@ -36,6 +36,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/helpbrowser/Makefile.am.orig Wed Jan 24 16:55:34 2001 +++ plug-ins/helpbrowser/Makefile.am Wed Jan 24 16:55:34 2001 @@ -13,6 +13,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ $(GTKXMHTML_CFLAGS) \ -I$(includedir) --- plug-ins/ifscompose/Makefile.am.orig Wed Jan 24 16:55:34 2001 +++ plug-ins/ifscompose/Makefile.am Wed Jan 24 16:55:34 2001 @@ -14,6 +14,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/imagemap/Makefile.am.orig Wed Jan 24 16:55:34 2001 +++ plug-ins/imagemap/Makefile.am Wed Jan 24 16:55:34 2001 @@ -168,6 +168,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/maze/Makefile.am.orig Wed Jan 24 16:55:34 2001 +++ plug-ins/maze/Makefile.am Wed Jan 24 16:55:34 2001 @@ -16,6 +16,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/mosaic/Makefile.am.orig Wed Jan 24 16:55:34 2001 +++ plug-ins/mosaic/Makefile.am Wed Jan 24 16:55:34 2001 @@ -13,6 +13,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/pagecurl/Makefile.am.orig Wed Jan 24 16:55:34 2001 +++ plug-ins/pagecurl/Makefile.am Wed Jan 24 16:55:34 2001 @@ -20,6 +20,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/print/Makefile.am.orig Wed Jan 24 16:55:35 2001 +++ plug-ins/print/Makefile.am Wed Jan 24 16:55:35 2001 @@ -38,6 +38,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/rcm/Makefile.am.orig Wed Jan 24 16:55:35 2001 +++ plug-ins/rcm/Makefile.am Wed Jan 24 16:55:35 2001 @@ -27,6 +27,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/sgi/Makefile.am.orig Wed Jan 24 16:55:35 2001 +++ plug-ins/sgi/Makefile.am Wed Jan 24 16:55:35 2001 @@ -14,6 +14,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/sel2path/Makefile.am.orig Wed Jan 24 16:55:35 2001 +++ plug-ins/sel2path/Makefile.am Wed Jan 24 16:55:35 2001 @@ -31,6 +31,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/webbrowser/Makefile.am.orig Wed Jan 24 16:55:35 2001 +++ plug-ins/webbrowser/Makefile.am Wed Jan 24 16:55:35 2001 @@ -16,6 +16,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/xjt/Makefile.am.orig Wed Jan 24 16:55:35 2001 +++ plug-ins/xjt/Makefile.am Wed Jan 24 16:55:35 2001 @@ -15,6 +15,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/common/Makefile.am.orig Wed Jan 24 16:55:31 2001 +++ plug-ins/common/Makefile.am Wed Jan 24 16:55:31 2001 @@ -13,6 +13,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl \ $(GTK_CFLAGS) \ -I$(includedir) --- configure.in.orig Wed Jan 24 16:13:19 2001 +++ configure.in Wed Jan 24 16:13:41 2001 @@ -146,6 +146,8 @@ changequote([,])dnl +AC_CHECK_HEADERS(math.h ieeefp.h) + dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R) AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) gimp_save_LIBS=$LIBS @@ -355,6 +357,20 @@ AC_FUNC_VPRINTF AC_FUNC_ALLOCA + +dnl Check for finite or isfinite +AC_CHECK_FUNCS(finite, , [ + AC_MSG_CHECKING(for finite in <math.h>) + AC_TRY_LINK([#include <math.h>], [double f = 0.0; finite (f)], [ + AC_DEFINE(HAVE_FINITE) + AC_MSG_RESULT(yes)], [ + AC_MSG_RESULT(no) + AC_MSG_CHECKING(for isfinite in <math.h>) + AC_TRY_LINK([#include <math.h>], [float f = 0.0; isfinite(f)], [ + AC_DEFINE(HAVE_ISFINITE) + AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))])]) +AC_SUBST(HAVE_FINITE) +AC_SUBST(HAVE_ISFINITE) dnl Check for sys/select.h --- config.h.in.orig Wed Jan 24 16:15:11 2001 +++ config.h.in Wed Jan 24 16:15:25 2001 @@ -186,3 +186,15 @@ /* Define if you have the i library (-li). */ #undef HAVE_LIBI + +/* Define if you have the <math.h> header file. */ +#undef HAVE_MATH_H + +/* Define if you have <ieeefp.h>. */ +#undef HAVE_IEEEFP_H + +/* Define if you have the finite() function. */ +#undef HAVE_FINITE + +/* Define if you have isfinite(). */ +#undef HAVE_ISFINITE --- acinclude.m4.orig Thu Jan 25 03:22:24 2001 +++ acinclude.m4 Thu Jan 25 03:26:58 2001 @@ -560,3 +560,387 @@ AC_SUBST(PYTHON_CFLAGS)dnl AC_SUBST(PYTHON_LINK)]) +# Macro to add for using GNU gettext. +# Ulrich Drepper <drepper@xxxxxxxxxx>, 1995. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 108 + +AC_DEFUN(AM_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + + USE_INCLUDED_LIBINTL=no + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested.]) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, gettext)]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$ac_cv_lib_intl_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define to 1 if you have gettext and don't want to use GNU gettext.]) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) + + if test "$CATOBJEXT" = "NONE"; then + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) + + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS, 1, + [Define as 1 if you have catgets and don't want to use GNU gettext.]) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl + if test "$GENCAT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, no) + if test "$GMSGFMT" = "no"; then + AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) + fi + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi]) + fi + fi + + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi + if test -z "$nls_cv_header_intl"; then + # Clean out junk possibly left behind by a previous configuration. + rm -f intl/libintl.h + fi + AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes + fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +AC_DEFUN(AM_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +strdup __argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY, 1, [Define to 1 if you have the stpcpy function.]) + fi + + AM_LC_MESSAGES + AM_WITH_NLS + + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl The reference to <locale.h> in the installed <libintl.h> file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include <locale.h>" + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header <locale.h>. Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) + + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + case "$srcdir" in + .) + posrcprefix="../" ;; + /* | [[A-Za-z]]:*) + posrcprefix="$srcdir/" ;; + *) + posrcprefix="../$srcdir/" ;; + esac + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) + +# Check whether LC_MESSAGES is available in <locale.h>. +# Ulrich Drepper <drepper@xxxxxxxxxx>, 1995. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 2 + +AC_DEFUN(AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your locale.h file contains LC_MESSAGES.]) + fi + fi]) + +# Search path for a program which passes the given test. +# Ulrich Drepper <drepper@xxxxxxxxxx>, 1996. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(AM_PATH_PROG_WITH_TEST, +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +])
