diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | acconfig.h | 2 | ||||
| -rw-r--r-- | configure.in | 15 |
9 files changed, 50 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Nov 4 17:36:08 2001 Manish Singh <yosh@gimp.org> + + * acconfig.h configure.in: sigsetjmp is macroized in some places, + so use AC_TRY_LINK instead of AC_CHECK_FUNCS for the check. + Sun Nov 4 19:16:23 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_color_parse): Implement gdk_color_parse() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6b323c717..0e06f7941 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Nov 4 17:36:08 2001 Manish Singh <yosh@gimp.org> + + * acconfig.h configure.in: sigsetjmp is macroized in some places, + so use AC_TRY_LINK instead of AC_CHECK_FUNCS for the check. + Sun Nov 4 19:16:23 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_color_parse): Implement gdk_color_parse() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6b323c717..0e06f7941 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Nov 4 17:36:08 2001 Manish Singh <yosh@gimp.org> + + * acconfig.h configure.in: sigsetjmp is macroized in some places, + so use AC_TRY_LINK instead of AC_CHECK_FUNCS for the check. + Sun Nov 4 19:16:23 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_color_parse): Implement gdk_color_parse() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6b323c717..0e06f7941 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Nov 4 17:36:08 2001 Manish Singh <yosh@gimp.org> + + * acconfig.h configure.in: sigsetjmp is macroized in some places, + so use AC_TRY_LINK instead of AC_CHECK_FUNCS for the check. + Sun Nov 4 19:16:23 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_color_parse): Implement gdk_color_parse() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6b323c717..0e06f7941 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Nov 4 17:36:08 2001 Manish Singh <yosh@gimp.org> + + * acconfig.h configure.in: sigsetjmp is macroized in some places, + so use AC_TRY_LINK instead of AC_CHECK_FUNCS for the check. + Sun Nov 4 19:16:23 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_color_parse): Implement gdk_color_parse() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6b323c717..0e06f7941 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Nov 4 17:36:08 2001 Manish Singh <yosh@gimp.org> + + * acconfig.h configure.in: sigsetjmp is macroized in some places, + so use AC_TRY_LINK instead of AC_CHECK_FUNCS for the check. + Sun Nov 4 19:16:23 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_color_parse): Implement gdk_color_parse() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6b323c717..0e06f7941 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Nov 4 17:36:08 2001 Manish Singh <yosh@gimp.org> + + * acconfig.h configure.in: sigsetjmp is macroized in some places, + so use AC_TRY_LINK instead of AC_CHECK_FUNCS for the check. + Sun Nov 4 19:16:23 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c (gdk_color_parse): Implement gdk_color_parse() diff --git a/acconfig.h b/acconfig.h index 4b3030585..46c889f71 100644 --- a/acconfig.h +++ b/acconfig.h @@ -37,6 +37,8 @@ #undef HAVE_XCONVERTCASE #undef HAVE_XFT +#undef HAVE_SIGSETJMP + #undef NO_FD_SET #undef RESOURCE_BASE diff --git a/configure.in b/configure.in index 27fd0c2e3..37f121a13 100644 --- a/configure.in +++ b/configure.in @@ -291,7 +291,18 @@ if test "x$enable_rebuilds" = "xyes" && \ fi AC_SUBST(REBUILD) -AC_CHECK_FUNCS(lstat mkstemp sigsetjmp bind_textdomain_codeset) +AC_CHECK_FUNCS(lstat mkstemp bind_textdomain_codeset) + +# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable +AC_MSG_CHECKING(for sigsetjmp) +AC_TRY_LINK([#include <setjmp.h>], [ +sigjmp_buf env; +sigsetjmp(env, 0); +], gtk_ok=yes, gtk_ok=no) +AC_MSG_RESULT($gtk_ok) +if test "$gtk_ok" = "yes"; then + AC_DEFINE(HAVE_SIGSETJMP) +fi AC_MSG_CHECKING(whether make is GNU Make) STRIP_BEGIN= @@ -385,7 +396,7 @@ AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H)) AC_CHECK_HEADERS(winsock.h, AC_DEFINE(HAVE_WINSOCK_H)) AC_CHECK_HEADERS(dimm.h, AC_DEFINE(HAVE_DIMM_H)) -if test ${with_wintab+set} = set && test $with_wintab != no; then +if test "${with_wintab+set}" = set && test $with_wintab != no; then AC_MSG_CHECKING([for wintab.h]) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I$with_wintab/include" |