1. HP-UX 11.00 does not have finite() but does have isfinite() as a
macro in <math.h>
2. If --with-included-gettext is specified, need to
-I$(top_srcdir)/intl
3. Fix for AM_WITH_NLS on Solaris
--
albert chin ([EMAIL PROTECTED])
-- snip snip
--- libgimp/gimpmath.h.orig Wed Dec 27 21:37:51 2000
+++ libgimp/gimpmath.h Wed Dec 27 21:39:32 2000
@@ -82,13 +82,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 Tue Dec 26 02:52:05 2000
+++ plug-ins/dbbrowser/Makefile.am Tue Dec 26 02:52:36 2000
@@ -16,6 +16,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/script-fu/Makefile.am.orig Tue Dec 26 02:58:14 2000
+++ plug-ins/script-fu/Makefile.am Tue Dec 26 02:58:42 2000
@@ -31,6 +31,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/FractalExplorer/Makefile.am.orig Tue Dec 26 03:00:30 2000
+++ plug-ins/FractalExplorer/Makefile.am Tue Dec 26 03:00:44 2000
@@ -22,6 +22,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/Lighting/Makefile.am.orig Tue Dec 26 03:02:48 2000
+++ plug-ins/Lighting/Makefile.am Tue Dec 26 03:03:01 2000
@@ -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 Tue Dec 26 03:04:25 2000
+++ plug-ins/MapObject/Makefile.am Tue Dec 26 03:04:38 2000
@@ -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 Tue Dec 26 03:07:05 2000
+++ plug-ins/bmp/Makefile.am Tue Dec 26 03:09:19 2000
@@ -12,6 +12,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/faxg3/Makefile.am.orig Tue Dec 26 03:11:59 2000
+++ plug-ins/faxg3/Makefile.am Tue Dec 26 03:12:34 2000
@@ -15,6 +15,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GLIB_CFLAGS) \
-I$(includedir)
--- plug-ins/fits/Makefile.am.orig Tue Dec 26 03:13:29 2000
+++ plug-ins/fits/Makefile.am Tue Dec 26 03:13:36 2000
@@ -11,6 +11,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/flame/Makefile.am.orig Tue Dec 26 03:17:07 2000
+++ plug-ins/flame/Makefile.am Tue Dec 26 03:17:24 2000
@@ -19,6 +19,7 @@
INCLUDES = \
-DLOCALEDIR=\""$(localedir)"\" \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/fp/Makefile.am.orig Tue Dec 26 03:19:10 2000
+++ plug-ins/fp/Makefile.am Tue Dec 26 03:19:23 2000
@@ -16,6 +16,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/gap/Makefile.am.orig Tue Dec 26 03:20:24 2000
+++ plug-ins/gap/Makefile.am Tue Dec 26 03:20:38 2000
@@ -205,6 +205,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/gdyntext/gdyntextcompat.h.orig Mon Dec 25 14:02:35 2000
+++ plug-ins/gdyntext/gdyntextcompat.h Mon Dec 25 14:02:45 2000
@@ -64,7 +64,9 @@
/* gimp-1.1.14+ function names reorganization forgotten something */
#if defined(GIMP_HAVE_PARASITES) && GIMP_MICRO_VERSION < 14
+#ifdef __GNUC__
# warning Replacing missing function 'gimp_drawable_parasite_find'
+#endif
# define gimp_drawable_parasite_find gimp_drawable_parasite_find
#endif
--- plug-ins/gdyntext/Makefile.am.orig Tue Dec 26 03:23:48 2000
+++ plug-ins/gdyntext/Makefile.am Tue Dec 26 03:23:57 2000
@@ -48,6 +48,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/gfig/Makefile.am.orig Tue Dec 26 03:25:11 2000
+++ plug-ins/gfig/Makefile.am Tue Dec 26 03:25:32 2000
@@ -17,6 +17,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/gflare/Makefile.am.orig Tue Dec 26 03:27:24 2000
+++ plug-ins/gflare/Makefile.am Tue Dec 26 03:27:32 2000
@@ -18,6 +18,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/gfli/Makefile.am.orig Tue Dec 26 03:29:21 2000
+++ plug-ins/gfli/Makefile.am Tue Dec 26 03:29:25 2000
@@ -11,6 +11,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/gimpressionist/Makefile.am.orig Tue Dec 26 03:30:37 2000
+++ plug-ins/gimpressionist/Makefile.am Tue Dec 26 03:30:43 2000
@@ -36,6 +36,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/ifscompose/Makefile.am.orig Tue Dec 26 03:32:53 2000
+++ plug-ins/ifscompose/Makefile.am Tue Dec 26 03:33:00 2000
@@ -14,6 +14,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/imagemap/Makefile.am.orig Tue Dec 26 03:34:27 2000
+++ plug-ins/imagemap/Makefile.am Tue Dec 26 03:34:33 2000
@@ -168,6 +168,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/maze/Makefile.am.orig Tue Dec 26 03:39:05 2000
+++ plug-ins/maze/Makefile.am Tue Dec 26 03:39:09 2000
@@ -16,6 +16,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/mosaic/Makefile.am.orig Tue Dec 26 03:40:18 2000
+++ plug-ins/mosaic/Makefile.am Tue Dec 26 03:40:22 2000
@@ -13,6 +13,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/pagecurl/Makefile.am.orig Tue Dec 26 03:41:12 2000
+++ plug-ins/pagecurl/Makefile.am Tue Dec 26 03:41:18 2000
@@ -20,6 +20,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/print/Makefile.am.orig Tue Dec 26 03:43:08 2000
+++ plug-ins/print/Makefile.am Tue Dec 26 03:43:13 2000
@@ -38,6 +38,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/rcm/Makefile.am.orig Tue Dec 26 03:44:33 2000
+++ plug-ins/rcm/Makefile.am Tue Dec 26 03:44:38 2000
@@ -27,6 +27,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/sgi/Makefile.am.orig Tue Dec 26 03:45:39 2000
+++ plug-ins/sgi/Makefile.am Tue Dec 26 03:45:43 2000
@@ -14,6 +14,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/sel2path/Makefile.am.orig Tue Dec 26 03:46:42 2000
+++ plug-ins/sel2path/Makefile.am Tue Dec 26 03:46:47 2000
@@ -31,6 +31,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/webbrowser/Makefile.am.orig Tue Dec 26 03:47:49 2000
+++ plug-ins/webbrowser/Makefile.am Tue Dec 26 03:47:53 2000
@@ -16,6 +16,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/xjt/Makefile.am.orig Tue Dec 26 03:48:46 2000
+++ plug-ins/xjt/Makefile.am Tue Dec 26 03:48:50 2000
@@ -15,6 +15,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- plug-ins/common/Makefile.am.orig Tue Dec 26 03:49:46 2000
+++ plug-ins/common/Makefile.am Tue Dec 26 03:49:51 2000
@@ -13,6 +13,7 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
--- configure.in.orig Tue Dec 26 00:58:35 2000
+++ configure.in Thu Dec 28 00:51:36 2000
@@ -348,6 +348,19 @@
AC_FUNC_ALLOCA
+dnl Check for finite or isfinite
+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
AC_MSG_CHECKING([fd_set and sys/select])
--- aclocal.m4.orig Tue Dec 26 02:07:15 2000
+++ aclocal.m4 Tue Dec 26 02:14:01 2000
@@ -832,10 +832,9 @@
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi
--- config.h.in.orig Wed Dec 27 21:31:43 2000
+++ config.h.in Wed Dec 27 21:37:32 2000
@@ -186,3 +186,9 @@
/* Define if you have the i library (-li). */
#undef HAVE_LIBI
+
+/* Define if you have the finite() function. */
+#undef HAVE_FINITE
+
+/* Define if you have isfinite(). */
+#undef HAVE_ISFINITE
