Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 9398 Details for
Bug 17521
sodipodi-0.31 ebuild failure (patch included)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
sodipodi-0.31 source patch
sodipodi-0.31-r1-gentoo.diff (text/plain), 193.46 KB, created by
Ben Cornett
on 2003-03-14 12:14:44 UTC
(
hide
)
Description:
sodipodi-0.31 source patch
Filename:
MIME Type:
Creator:
Ben Cornett
Created:
2003-03-14 12:14:44 UTC
Size:
193.46 KB
patch
obsolete
>diff -ur sodipodi-0.31/Makefile.in sodipodi-0.31.fix2/Makefile.in >--- sodipodi-0.31/Makefile.in 2003-02-22 09:11:23.000000000 -0500 >+++ sodipodi-0.31.fix2/Makefile.in 2003-03-14 11:38:18.000000000 -0500 >@@ -83,9 +83,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -95,10 +93,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -107,6 +107,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/aclocal.m4 sodipodi-0.31.fix2/aclocal.m4 >--- sodipodi-0.31/aclocal.m4 2003-02-22 08:57:48.000000000 -0500 >+++ sodipodi-0.31.fix2/aclocal.m4 2003-03-13 18:02:45.000000000 -0500 >@@ -860,6 +860,7 @@ > INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -k -u -c $(top_builddir)/po/.intltool-merge-cache' >+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p' > INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' >@@ -868,11 +869,13 @@ > INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' >- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' >+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' >+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' > > AC_SUBST(INTLTOOL_DESKTOP_RULE) > AC_SUBST(INTLTOOL_DIRECTORY_RULE) > AC_SUBST(INTLTOOL_KEYS_RULE) >+AC_SUBST(INTLTOOL_PROP_RULE) > AC_SUBST(INTLTOOL_OAF_RULE) > AC_SUBST(INTLTOOL_PONG_RULE) > AC_SUBST(INTLTOOL_SERVER_RULE) >@@ -882,6 +885,7 @@ > AC_SUBST(INTLTOOL_XML_RULE) > AC_SUBST(INTLTOOL_CAVES_RULE) > AC_SUBST(INTLTOOL_SCHEMAS_RULE) >+AC_SUBST(INTLTOOL_THEME_RULE) > > # Use the tools built into the package, not the ones that are installed. > >@@ -1129,21 +1133,37 @@ > # Modified to never use included libintl. > # Owen Taylor <otaylor@redhat.com>, 12/15/1998 > # >+# Major rework to remove unused code >+# Owen Taylor <otaylor@redhat.com>, 12/11/2002 > # > # 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. >-# >-# >-# If you make changes to this file, you MUST update the copy in >-# acinclude.m4. [ aclocal dies on duplicate macros, so if >-# we run 'aclocal -I macros/' then we'll run into problems >-# once we've installed glib-gettext.m4 :-( ] > # > >-AC_DEFUN([AM_GLIB_LC_MESSAGES], >- [if test $ac_cv_header_locale_h = yes; then >+# >+# We need this here as well, since someone might use autoconf-2.5x >+# to configure GLib then an older version to configure a package >+# using AM_GLIB_GNU_GETTEXT >+AC_PREREQ(2.53) >+ >+dnl >+dnl We go to great lengths to make sure that aclocal won't >+dnl try to pull in the installed version of these macros >+dnl when running aclocal in the glib directory. >+dnl >+m4_copy([AC_DEFUN],[glib_DEFUN]) >+m4_copy([AC_REQUIRE],[glib_REQUIRE]) >+dnl >+dnl At the end, if we're not within glib, we'll define the public >+dnl definitions in terms of our private definitions. >+dnl >+ >+# GLIB_LC_MESSAGES >+#-------------------- >+glib_DEFUN([GLIB_LC_MESSAGES], >+ [AC_CHECK_HEADERS([locale.h]) >+ 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)]) >@@ -1153,9 +1173,11 @@ > fi > fi]) > >-dnl AM_GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, >+# GLIB_PATH_PROG_WITH_TEST >+#---------------------------- >+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, > dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) >-AC_DEFUN([AM_GLIB_PATH_PROG_WITH_TEST], >+glib_DEFUN([GLIB_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]) >@@ -1191,101 +1213,120 @@ > AC_SUBST($1)dnl > ]) > >-# serial 5 >- >-AC_DEFUN(AM_GLIB_WITH_NLS, >+# GLIB_WITH_NLS >+#----------------- >+glib_DEFUN([GLIB_WITH_NLS], > dnl NLS is obligatory > [USE_NLS=yes > AC_SUBST(USE_NLS) > >- dnl Figure out what method >- nls_cv_force_use_gnu_gettext="no" >+ gt_cv_have_gettext=no > >- 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 >- XGETTEXT=: >- >- AC_CHECK_HEADER(libintl.h, >- [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, >- [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")], >- gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)]) >- >- gt_cv_func_dgettext_libintl="no" >- libintl_extra_libs="" >- >- if test "$gt_cv_func_dgettext_libc" != "yes" ; then >- AC_CHECK_LIB(intl, bindtextdomain, >- [AC_CHECK_LIB(intl, dgettext, >- gt_cv_func_dgettext_libintl=yes)]) >- >- if test "$gt_cv_func_dgettext_libc" != "yes" ; then >- AC_MSG_CHECKING([if -liconv is needed to use gettext]) >- AC_MSG_RESULT([]) >- AC_CHECK_LIB(intl, dcgettext, >- [gt_cv_func_dgettext_libintl=yes >- libintl_extra_libs=-liconv], >- :,-liconv) >- fi >- fi >+ CATOBJEXT=NONE >+ XGETTEXT=: >+ INTLLIBS= >+ >+ AC_CHECK_HEADER(libintl.h, >+ [gt_cv_func_dgettext_libintl="no" >+ libintl_extra_libs="" >+ >+ # >+ # First check in libc >+ # >+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, >+ [AC_TRY_LINK([ >+#include <libintl.h> >+], >+ [return (int) dgettext ("","")], >+ gt_cv_func_dgettext_libc=yes, >+ gt_cv_func_dgettext_libc=no) >+ ]) >+ >+ if test "$gt_cv_func_dgettext_libc" = "yes" ; then >+ AC_CHECK_FUNCS(bind_textdomain_codeset) >+ fi >+ >+ # >+ # If we don't have everything we want, check in libintl >+ # >+ if test "$gt_cv_func_dgettext_libc" != "yes" \ >+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then >+ >+ AC_CHECK_LIB(intl, bindtextdomain, >+ [AC_CHECK_LIB(intl, dgettext, >+ gt_cv_func_dgettext_libintl=yes)]) >+ >+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then >+ AC_MSG_CHECKING([if -liconv is needed to use gettext]) >+ AC_MSG_RESULT([]) >+ AC_CHECK_LIB(intl, dcgettext, >+ [gt_cv_func_dgettext_libintl=yes >+ libintl_extra_libs=-liconv], >+ :,-liconv) >+ fi > >- if test "$gt_cv_func_dgettext_libintl" = "yes"; then >- LIBS="$LIBS -lintl $libintl_extra_libs"; >+ # >+ # If we found libintl, then check in it for bind_textdomain_codeset(); >+ # we'll prefer libc if neither have bind_textdomain_codeset(), >+ # and both have dgettext >+ # >+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then >+ glib_save_LIBS="$LIBS" >+ LIBS="$LIBS -lintl $libintl_extra_libs" >+ unset ac_cv_func_bind_textdomain_codeset >+ AC_CHECK_FUNCS(bind_textdomain_codeset) >+ LIBS="$glib_save_LIBS" >+ >+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then >+ gt_cv_func_dgettext_libc=no >+ else >+ if test "$gt_cv_func_dgettext_libc" = "yes"; then >+ gt_cv_func_dgettext_libintl=no >+ fi > fi >+ fi >+ fi > >- if test "$gt_cv_func_dgettext_libc" = "yes" \ >- || test "$gt_cv_func_dgettext_libintl" = "yes"; then >- AC_DEFINE(HAVE_GETTEXT,1, >- [Define if the GNU gettext() function is already present or preinstalled.]) >- AM_GLIB_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_GLIB_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 >- >- # Added by Martin Baulig 12/15/98 for libc5 systems >- if test "$gt_cv_func_dgettext_libc" != "yes" \ >- && test "$gt_cv_func_dgettext_libintl" = "yes"; then >- INTLLIBS="-lintl $libintl_extra_libs" >- LIBS=`echo $LIBS | sed -e 's/-lintl//'` >- 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 >+ if test "$gt_cv_func_dgettext_libc" = "yes" \ >+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then >+ gt_cv_have_gettext=yes > fi >- fi >+ >+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then >+ INTLLIBS="-lintl $libintl_extra_libs" >+ fi >+ >+ if test "$gt_cv_have_gettext" = "yes"; then >+ AC_DEFINE(HAVE_GETTEXT,1, >+ [Define if the GNU gettext() function is already present or preinstalled.]) >+ GLIB_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) >+ GLIB_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 >+ else >+ gt_cv_have_gettext=no >+ fi >+ fi >+ ]) > >- if test "$nls_cv_use_gnu_gettext" != "yes"; then >+ if test "$gt_cv_have_gettext" = "yes" ; then > AC_DEFINE(ENABLE_NLS, 1, > [always defined to indicate that i18n is enabled]) >- else >- dnl Unset this variable since we use the non-zero value as a flag. >- CATOBJEXT= > 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 If it is not GNU xgettext we define it as : so that the > dnl Makefiles still can work. > if $XGETTEXT --omit-header /dev/null 2> /dev/null; then > : ; >@@ -1318,34 +1359,31 @@ > AC_SUBST(DATADIRNAME) > AC_SUBST(GMOFILES) > AC_SUBST(INSTOBJEXT) >- AC_SUBST(INTLDEPS) > AC_SUBST(INTLLIBS) >- AC_SUBST(INTLOBJS) >+ AC_SUBST(PO_IN_DATADIR_TRUE) >+ AC_SUBST(PO_IN_DATADIR_FALSE) > AC_SUBST(POFILES) > AC_SUBST(POSUB) > ]) > >-AC_DEFUN(AM_GLIB_GNU_GETTEXT, >- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl >- AC_REQUIRE([AC_PROG_CC])dnl >- AC_REQUIRE([AC_PROG_RANLIB])dnl >+# AM_GLIB_GNU_GETTEXT >+# ------------------- >+# Do checks necessary for use of gettext. If a suitable implementation >+# of gettext is found in either in libintl or in the C library, >+# it will set INTLLIBS to the libraries needed for use of gettext >+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable >+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() >+# on various variables needed by the Makefile.in.in installed by >+# glib-gettextize. >+dnl >+glib_DEFUN(GLIB_GNU_GETTEXT, >+ [AC_REQUIRE([AC_PROG_CC])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]) >- >- AM_GLIB_LC_MESSAGES >- AM_GLIB_WITH_NLS >+ >+ GLIB_LC_MESSAGES >+ GLIB_WITH_NLS > >- if test "x$CATOBJEXT" != "x"; then >+ if test "$gt_cv_have_gettext" = "yes"; then > if test "x$ALL_LINGUAS" = "x"; then > LINGUAS= > else >@@ -1366,18 +1404,6 @@ > fi > fi > >- 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 po || mkdir po >- 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/po/$msgformat-msg.sed > po/po2msg.sed >- fi >- > 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. >@@ -1407,6 +1433,31 @@ > < $srcdir/po/POTFILES.in > po/POTFILES > ]) > >+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) >+# ------------------------------- >+# Define VARIABLE to the location where catalog files will >+# be installed by po/Makefile. >+glib_DEFUN(GLIB_DEFINE_LOCALEDIR, >+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl >+glib_save_prefix="$prefix" >+test "x$prefix" = xNONE && prefix=$ac_default_prefix >+if test "x$CATOBJEXT" = "x.mo" ; then >+ localedir=`eval echo "${libdir}/locale"` >+else >+ localedir=`eval echo "${datadir}/locale"` >+fi >+prefix="$glib_save_prefix" >+AC_DEFINE_UNQUOTED($1, "$localedir", >+ [Define the location where the catalogs will be installed]) >+]) >+ >+dnl >+dnl Now the definitions that aclocal will find >+dnl >+ifdef(glib_configure_in,[],[ >+AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)]) >+AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)]) >+])dnl > > > dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) >diff -ur sodipodi-0.31/config.guess sodipodi-0.31.fix2/config.guess >--- sodipodi-0.31/config.guess 2003-02-10 12:53:46.000000000 -0500 >+++ sodipodi-0.31.fix2/config.guess 2003-03-14 11:34:58.000000000 -0500 >@@ -1,9 +1,9 @@ > #! /bin/sh > # Attempt to guess a canonical system name. > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, >-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. >+# 2000, 2001, 2002 Free Software Foundation, Inc. > >-timestamp='2003-01-10' >+timestamp='2002-07-23' > > # This file is free software; you can redistribute it and/or modify it > # under the terms of the GNU General Public License as published by >@@ -98,31 +98,30 @@ > # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still > # use `HOST_CC' if defined, but it is deprecated. > >-# Portable tmp directory creation inspired by the Autoconf team. >+# This shell variable is my proudest work .. or something. --bje > >-set_cc_for_build=' >-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; >-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; >-: ${TMPDIR=/tmp} ; >- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || >- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || >- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; >-dummy=$tmp/dummy ; >-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; >+set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; >+(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) >+ || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; >+dummy=$tmpdir/dummy ; >+files="$dummy.c $dummy.o $dummy.rel $dummy" ; >+trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; > case $CC_FOR_BUILD,$HOST_CC,$CC in > ,,) echo "int x;" > $dummy.c ; > for c in cc gcc c89 c99 ; do >- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then >+ if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then > CC_FOR_BUILD="$c"; break ; > fi ; > done ; >+ rm -f $files ; > if test x"$CC_FOR_BUILD" = x ; then > CC_FOR_BUILD=no_compiler_found ; > fi > ;; > ,,*) CC_FOR_BUILD=$CC ;; > ,*,*) CC_FOR_BUILD=$HOST_CC ;; >-esac ;' >+esac ; >+unset files' > > # This is needed to find uname on a Pyramid OSx when run in the BSD universe. > # (ghazi@noc.rutgers.edu 1994-08-24) >@@ -179,18 +178,7 @@ > ;; > esac > # The OS release >- # Debian GNU/NetBSD machines have a different userland, and >- # thus, need a distinct triplet. However, they do not need >- # kernel version information, so it can be replaced with a >- # suitable tag, in the style of linux-gnu. >- case "${UNAME_VERSION}" in >- Debian*) >- release='-gnu' >- ;; >- *) >- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` >- ;; >- esac >+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` > # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: > # contains redundant information, the shorter form: > # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. >@@ -235,9 +223,6 @@ > *:OpenBSD:*:*) > echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} > exit 0 ;; >- *:MicroBSD:*:*) >- echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} >- exit 0 ;; > alpha:OSF1:*:*) > if test $UNAME_RELEASE = "V4.0"; then > UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` >@@ -272,7 +257,7 @@ > jsr \$26,exit > .end main > EOF >- $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null >+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null > if test "$?" = 0 ; then > case `$dummy` in > 0-0) >@@ -301,6 +286,7 @@ > ;; > esac > fi >+ rm -f $dummy.s $dummy && rmdir $tmpdir > echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` > exit 0 ;; > Alpha\ *:Windows_NT*:*) >@@ -451,18 +437,16 @@ > exit (-1); > } > EOF >- $CC_FOR_BUILD -o $dummy $dummy.c \ >+ $CC_FOR_BUILD $dummy.c -o $dummy \ > && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ >- && exit 0 >+ && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 >+ rm -f $dummy.c $dummy && rmdir $tmpdir > echo mips-mips-riscos${UNAME_RELEASE} > exit 0 ;; > Motorola:PowerMAX_OS:*:*) > echo powerpc-motorola-powermax > exit 0 ;; >- Motorola:*:4.3:PL8-*) >- echo powerpc-harris-powermax >- exit 0 ;; >- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) >+ Night_Hawk:*:*:PowerMAX_OS) > echo powerpc-harris-powermax > exit 0 ;; > Night_Hawk:Power_UNIX:*:*) >@@ -537,7 +521,8 @@ > exit(0); > } > EOF >- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 >+ $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 >+ rm -f $dummy.c $dummy && rmdir $tmpdir > echo rs6000-ibm-aix3.2.5 > elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then > echo rs6000-ibm-aix3.2.4 >@@ -635,21 +620,11 @@ > exit (0); > } > EOF >- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` >- test -z "$HP_ARCH" && HP_ARCH=hppa >+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy` >+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi >+ rm -f $dummy.c $dummy && rmdir $tmpdir > fi ;; > esac >- if [ ${HP_ARCH} = "hppa2.0w" ] >- then >- # avoid double evaluation of $set_cc_for_build >- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build >- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null >- then >- HP_ARCH="hppa2.0w" >- else >- HP_ARCH="hppa64" >- fi >- fi > echo ${HP_ARCH}-hp-hpux${HPUX_REV} > exit 0 ;; > ia64:HP-UX:*:*) >@@ -683,7 +658,8 @@ > exit (0); > } > EOF >- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 >+ $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 >+ rm -f $dummy.c $dummy && rmdir $tmpdir > echo unknown-hitachi-hiuxwe2 > exit 0 ;; > 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) >@@ -741,15 +717,15 @@ > CRAY*TS:*:*:*) > echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' > exit 0 ;; >+ CRAY*T3D:*:*:*) >+ echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' >+ exit 0 ;; > CRAY*T3E:*:*:*) > echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' > exit 0 ;; > CRAY*SV1:*:*:*) > echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' > exit 0 ;; >- *:UNICOS/mp:*:*) >- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' >- exit 0 ;; > F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) > FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` > FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` >@@ -777,6 +753,7 @@ > #endif > EOF > eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` >+ rm -f $dummy.c && rmdir $tmpdir > echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} > exit 0 ;; > i*:CYGWIN*:*) >@@ -789,16 +766,13 @@ > echo ${UNAME_MACHINE}-pc-pw32 > exit 0 ;; > x86:Interix*:3*) >- echo i586-pc-interix3 >- exit 0 ;; >- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) >- echo i${UNAME_MACHINE}-pc-mks >+ echo i386-pc-interix3 > exit 0 ;; > i*:Windows_NT*:* | Pentium*:Windows_NT*:*) > # How do we know it's Interix rather than the generic POSIX subsystem? > # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we > # UNAME_MACHINE based on the output of uname instead of i386? >- echo i586-pc-interix >+ echo i386-pc-interix > exit 0 ;; > i*:UWIN*:*) > echo ${UNAME_MACHINE}-pc-uwin >@@ -841,26 +815,8 @@ > #endif > EOF > eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` >- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 >- ;; >- mips64:Linux:*:*) >- eval $set_cc_for_build >- sed 's/^ //' << EOF >$dummy.c >- #undef CPU >- #undef mips64 >- #undef mips64el >- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) >- CPU=mips64el >- #else >- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) >- CPU=mips64 >- #else >- CPU= >- #endif >- #endif >-EOF >- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` >- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 >+ rm -f $dummy.c && rmdir $tmpdir >+ test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 > ;; > ppc:Linux:*:*) > echo powerpc-unknown-linux-gnu >@@ -955,6 +911,7 @@ > #endif > EOF > eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` >+ rm -f $dummy.c && rmdir $tmpdir > test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 > test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 > ;; >@@ -972,23 +929,6 @@ > # Use sysv4.2uw... so that sysv4* matches it. > echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} > exit 0 ;; >- i*86:OS/2:*:*) >- # If we were able to find `uname', then EMX Unix compatibility >- # is probably installed. >- echo ${UNAME_MACHINE}-pc-os2-emx >- exit 0 ;; >- i*86:XTS-300:*:STOP) >- echo ${UNAME_MACHINE}-unknown-stop >- exit 0 ;; >- i*86:atheos:*:*) >- echo ${UNAME_MACHINE}-unknown-atheos >- exit 0 ;; >- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) >- echo i386-unknown-lynxos${UNAME_RELEASE} >- exit 0 ;; >- i*86:*DOS:*:*) >- echo ${UNAME_MACHINE}-pc-msdosdjgpp >- exit 0 ;; > i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) > UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` > if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then >@@ -1023,6 +963,9 @@ > echo ${UNAME_MACHINE}-pc-sysv32 > fi > exit 0 ;; >+ i*86:*DOS:*:*) >+ echo ${UNAME_MACHINE}-pc-msdosdjgpp >+ exit 0 ;; > pc:*:*:*) > # Left here for compatibility: > # uname -m prints for DJGPP always 'pc', but it prints nothing about >@@ -1046,15 +989,9 @@ > # "miniframe" > echo m68010-convergent-sysv > exit 0 ;; >- mc68k:UNIX:SYSTEM5:3.51m) >- echo m68k-convergent-sysv >- exit 0 ;; >- M680?0:D-NIX:5.3:*) >- echo m68k-diab-dnix >- exit 0 ;; > M68*:*:R3V[567]*:*) > test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; >- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) >+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) > OS_REL='' > test -r /etc/.relid \ > && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` >@@ -1071,6 +1008,9 @@ > mc68030:UNIX_System_V:4.*:*) > echo m68k-atari-sysv4 > exit 0 ;; >+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) >+ echo i386-unknown-lynxos${UNAME_RELEASE} >+ exit 0 ;; > TSUNAMI:LynxOS:2.*:*) > echo sparc-unknown-lynxos${UNAME_RELEASE} > exit 0 ;; >@@ -1142,9 +1082,6 @@ > SX-5:SUPER-UX:*:*) > echo sx5-nec-superux${UNAME_RELEASE} > exit 0 ;; >- SX-6:SUPER-UX:*:*) >- echo sx6-nec-superux${UNAME_RELEASE} >- exit 0 ;; > Power*:Rhapsody:*:*) > echo powerpc-apple-rhapsody${UNAME_RELEASE} > exit 0 ;; >@@ -1152,11 +1089,7 @@ > echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} > exit 0 ;; > *:Darwin:*:*) >- case `uname -p` in >- *86) UNAME_PROCESSOR=i686 ;; >- powerpc) UNAME_PROCESSOR=powerpc ;; >- esac >- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} >+ echo `uname -p`-apple-darwin${UNAME_RELEASE} > exit 0 ;; > *:procnto*:*:* | *:QNX:[0123456789]*:*) > UNAME_PROCESSOR=`uname -p` >@@ -1169,7 +1102,7 @@ > *:QNX:*:4*) > echo i386-pc-qnx > exit 0 ;; >- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) >+ NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) > echo nsr-tandem-nsk${UNAME_RELEASE} > exit 0 ;; > *:NonStop-UX:*:*) >@@ -1192,6 +1125,11 @@ > fi > echo ${UNAME_MACHINE}-unknown-plan9 > exit 0 ;; >+ i*86:OS/2:*:*) >+ # If we were able to find `uname', then EMX Unix compatibility >+ # is probably installed. >+ echo ${UNAME_MACHINE}-pc-os2-emx >+ exit 0 ;; > *:TOPS-10:*:*) > echo pdp10-unknown-tops10 > exit 0 ;; >@@ -1210,6 +1148,12 @@ > *:ITS:*:*) > echo pdp10-unknown-its > exit 0 ;; >+ i*86:XTS-300:*:STOP) >+ echo ${UNAME_MACHINE}-unknown-stop >+ exit 0 ;; >+ i*86:atheos:*:*) >+ echo ${UNAME_MACHINE}-unknown-atheos >+ exit 0 ;; > esac > > #echo '(No uname command or uname output not recognized.)' 1>&2 >@@ -1330,7 +1274,8 @@ > } > EOF > >-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 >+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 >+rm -f $dummy.c $dummy && rmdir $tmpdir > > # Apollos put the system type in the environment. > >diff -ur sodipodi-0.31/config.h.in sodipodi-0.31.fix2/config.h.in >--- sodipodi-0.31/config.h.in 2003-02-22 08:57:56.000000000 -0500 >+++ sodipodi-0.31.fix2/config.h.in 2003-03-14 11:48:40.000000000 -0500 >@@ -1,38 +1,17 @@ > /* config.h.in. Generated from configure.in by autoheader. */ > >-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP >- systems. This function is required for `alloca.c' support on those systems. >- */ >-#undef CRAY_STACKSEG_END >- >-/* Define to 1 if using `alloca.c'. */ >-#undef C_ALLOCA >- > /* always defined to indicate that i18n is enabled */ > #undef ENABLE_NLS > > /* Translation domain used */ > #undef GETTEXT_PACKAGE > >-/* Define to 1 if you have `alloca', as a function or macro. */ >-#undef HAVE_ALLOCA >- >-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). >- */ >-#undef HAVE_ALLOCA_H >- >-/* Define to 1 if you have the <argz.h> header file. */ >-#undef HAVE_ARGZ_H >+/* Define to 1 if you have the `bind_textdomain_codeset' function. */ >+#undef HAVE_BIND_TEXTDOMAIN_CODESET > > /* Define to 1 if you have the `dcgettext' function. */ > #undef HAVE_DCGETTEXT > >-/* Define to 1 if you have the `getcwd' function. */ >-#undef HAVE_GETCWD >- >-/* Define to 1 if you have the `getpagesize' function. */ >-#undef HAVE_GETPAGESIZE >- > /* Define if the GNU gettext() function is already present or preinstalled. */ > #undef HAVE_GETTEXT > >@@ -42,60 +21,24 @@ > /* Define if your <locale.h> file defines LC_MESSAGES. */ > #undef HAVE_LC_MESSAGES > >-/* Define to 1 if you have the <limits.h> header file. */ >-#undef HAVE_LIMITS_H >- > /* Define to 1 if you have the <locale.h> header file. */ > #undef HAVE_LOCALE_H > >-/* Define to 1 if you have the <malloc.h> header file. */ >-#undef HAVE_MALLOC_H >- > /* Define to 1 if you have the <memory.h> header file. */ > #undef HAVE_MEMORY_H > >-/* Define to 1 if you have a working `mmap' system call. */ >-#undef HAVE_MMAP >- >-/* Define to 1 if you have the `munmap' function. */ >-#undef HAVE_MUNMAP >- >-/* Define to 1 if you have the <nl_types.h> header file. */ >-#undef HAVE_NL_TYPES_H >- >-/* Define to 1 if you have the `putenv' function. */ >-#undef HAVE_PUTENV >- >-/* Define to 1 if you have the `setenv' function. */ >-#undef HAVE_SETENV >- >-/* Define to 1 if you have the `setlocale' function. */ >-#undef HAVE_SETLOCALE >- > /* Define to 1 if you have the <stdint.h> header file. */ > #undef HAVE_STDINT_H > > /* Define to 1 if you have the <stdlib.h> header file. */ > #undef HAVE_STDLIB_H > >-/* Define to 1 if you have the `strcasecmp' function. */ >-#undef HAVE_STRCASECMP >- >-/* Define to 1 if you have the `strchr' function. */ >-#undef HAVE_STRCHR >- >-/* Define to 1 if you have the `strdup' function. */ >-#undef HAVE_STRDUP >- > /* Define to 1 if you have the <strings.h> header file. */ > #undef HAVE_STRINGS_H > > /* Define to 1 if you have the <string.h> header file. */ > #undef HAVE_STRING_H > >-/* Define to 1 if you have the <sys/param.h> header file. */ >-#undef HAVE_SYS_PARAM_H >- > /* Define to 1 if you have the <sys/stat.h> header file. */ > #undef HAVE_SYS_STAT_H > >@@ -105,15 +48,6 @@ > /* Define to 1 if you have the <unistd.h> header file. */ > #undef HAVE_UNISTD_H > >-/* Define to 1 if you have the `__argz_count' function. */ >-#undef HAVE___ARGZ_COUNT >- >-/* Define to 1 if you have the `__argz_next' function. */ >-#undef HAVE___ARGZ_NEXT >- >-/* Define to 1 if you have the `__argz_stringify' function. */ >-#undef HAVE___ARGZ_STRINGIFY >- > /* Name of package */ > #undef PACKAGE > >@@ -135,14 +69,6 @@ > /* Define to the version of this package. */ > #undef PACKAGE_VERSION > >-/* If using the C implementation of alloca, define if you know the >- direction of stack growth for your system; otherwise it will be >- automatically deduced at run-time. >- STACK_DIRECTION > 0 => grows toward higher addresses >- STACK_DIRECTION < 0 => grows toward lower addresses >- STACK_DIRECTION = 0 => direction of growth unknown */ >-#undef STACK_DIRECTION >- > /* Define to 1 if you have the ANSI C header files. */ > #undef STDC_HEADERS > >@@ -163,16 +89,3 @@ > > /* Use Xft font database */ > #undef WITH_XFT >- >-/* Define to empty if `const' does not conform to ANSI C. */ >-#undef const >- >-/* Define as `__inline' if that's what the C compiler calls it, or to nothing >- if it is not supported. */ >-#undef inline >- >-/* Define to `long' if <sys/types.h> does not define. */ >-#undef off_t >- >-/* Define to `unsigned' if <sys/types.h> does not define. */ >-#undef size_t >diff -ur sodipodi-0.31/config.sub sodipodi-0.31.fix2/config.sub >--- sodipodi-0.31/config.sub 2003-02-10 12:54:03.000000000 -0500 >+++ sodipodi-0.31.fix2/config.sub 2003-03-14 11:34:58.000000000 -0500 >@@ -1,9 +1,9 @@ > #! /bin/sh > # Configuration validation subroutine script. > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, >-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. >+# 2000, 2001, 2002 Free Software Foundation, Inc. > >-timestamp='2003-01-03' >+timestamp='2002-07-03' > > # This file is (in principle) common to ALL GNU software. > # The presence of a machine in this file suggests that SOME GNU software >@@ -118,7 +118,7 @@ > # Here we must recognize all the valid KERNEL-OS combinations. > maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` > case $maybe_os in >- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) >+ nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) > os=-$maybe_os > basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` > ;; >@@ -229,7 +229,7 @@ > | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ > | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ > | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ >- | clipper \ >+ | c4x | clipper \ > | d10v | d30v | dlx | dsp16xx \ > | fr30 | frv \ > | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ >@@ -239,19 +239,15 @@ > | mips | mipsbe | mipseb | mipsel | mipsle \ > | mips16 \ > | mips64 | mips64el \ >- | mips64vr | mips64vrel \ > | mips64orion | mips64orionel \ > | mips64vr4100 | mips64vr4100el \ > | mips64vr4300 | mips64vr4300el \ > | mips64vr5000 | mips64vr5000el \ > | mipsisa32 | mipsisa32el \ >- | mipsisa32r2 | mipsisa32r2el \ > | mipsisa64 | mipsisa64el \ > | mipsisa64sb1 | mipsisa64sb1el \ >- | mipsisa64sr71k | mipsisa64sr71kel \ > | mipstx39 | mipstx39el \ > | mn10200 | mn10300 \ >- | msp430 \ > | ns16k | ns32k \ > | openrisc | or32 \ > | pdp10 | pdp11 | pj | pjl \ >@@ -296,7 +292,7 @@ > | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ > | avr-* \ > | bs2000-* \ >- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ >+ | c[123]* | c30-* | [cjt]90-* | c54x-* \ > | clipper-* | cydra-* \ > | d10v-* | d30v-* | dlx-* \ > | elxsi-* \ >@@ -311,19 +307,15 @@ > | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ > | mips16-* \ > | mips64-* | mips64el-* \ >- | mips64vr-* | mips64vrel-* \ > | mips64orion-* | mips64orionel-* \ > | mips64vr4100-* | mips64vr4100el-* \ > | mips64vr4300-* | mips64vr4300el-* \ > | mips64vr5000-* | mips64vr5000el-* \ > | mipsisa32-* | mipsisa32el-* \ >- | mipsisa32r2-* | mipsisa32r2el-* \ > | mipsisa64-* | mipsisa64el-* \ > | mipsisa64sb1-* | mipsisa64sb1el-* \ >- | mipsisa64sr71k-* | mipsisa64sr71kel-* \ >- | mipstx39-* | mipstx39el-* \ >- | msp430-* \ >- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ >+ | mipstx39 | mipstx39el \ >+ | none-* | np1-* | ns16k-* | ns32k-* \ > | orion-* \ > | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ > | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ >@@ -333,7 +325,7 @@ > | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ > | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ > | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ >- | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ >+ | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ > | v850-* | v850e-* | vax-* \ > | we32k-* \ > | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ >@@ -720,10 +712,6 @@ > np1) > basic_machine=np1-gould > ;; >- nv1) >- basic_machine=nv1-cray >- os=-unicosmp >- ;; > nsr-tandem) > basic_machine=nsr-tandem > ;; >@@ -757,13 +745,13 @@ > pbb) > basic_machine=m68k-tti > ;; >- pc532 | pc532-*) >+ pc532 | pc532-*) > basic_machine=ns32k-pc532 > ;; > pentium | p5 | k5 | k6 | nexgen | viac3) > basic_machine=i586-pc > ;; >- pentiumpro | p6 | 6x86 | athlon | athlon_*) >+ pentiumpro | p6 | 6x86 | athlon) > basic_machine=i686-pc > ;; > pentiumii | pentium2) >@@ -784,22 +772,22 @@ > power) basic_machine=power-ibm > ;; > ppc) basic_machine=powerpc-unknown >- ;; >+ ;; > ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` > ;; > ppcle | powerpclittle | ppc-le | powerpc-little) > basic_machine=powerpcle-unknown >- ;; >+ ;; > ppcle-* | powerpclittle-*) > basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` > ;; > ppc64) basic_machine=powerpc64-unknown >- ;; >+ ;; > ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` > ;; > ppc64le | powerpc64little | ppc64-le | powerpc64-little) > basic_machine=powerpc64le-unknown >- ;; >+ ;; > ppc64le-* | powerpc64little-*) > basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` > ;; >@@ -830,12 +818,6 @@ > basic_machine=a29k-amd > os=-udi > ;; >- sb1) >- basic_machine=mipsisa64sb1-unknown >- ;; >- sb1el) >- basic_machine=mipsisa64sb1el-unknown >- ;; > sequent) > basic_machine=i386-sequent > ;; >@@ -901,7 +883,7 @@ > sun386 | sun386i | roadrunner) > basic_machine=i386-sun > ;; >- sv1) >+ sv1) > basic_machine=sv1-cray > os=-unicos > ;; >@@ -909,6 +891,10 @@ > basic_machine=i386-sequent > os=-dynix > ;; >+ t3d) >+ basic_machine=alpha-cray >+ os=-unicos >+ ;; > t3e) > basic_machine=alphaev5-cray > os=-unicos >@@ -917,10 +903,6 @@ > basic_machine=t90-cray > os=-unicos > ;; >- tic4x | c4x*) >- basic_machine=tic4x-unknown >- os=-coff >- ;; > tic54x | c54x*) > basic_machine=tic54x-unknown > os=-coff >@@ -959,8 +941,8 @@ > os=-vms > ;; > vpp*|vx|vx-*) >- basic_machine=f301-fujitsu >- ;; >+ basic_machine=f301-fujitsu >+ ;; > vxworks960) > basic_machine=i960-wrs > os=-vxworks >@@ -981,7 +963,11 @@ > basic_machine=hppa1.1-winbond > os=-proelf > ;; >- xps | xps100) >+ windows32) >+ basic_machine=i386-pc >+ os=-windows32-msvcrt >+ ;; >+ xps | xps100) > basic_machine=xps100-honeywell > ;; > ymp) >@@ -1036,7 +1022,7 @@ > sparc | sparcv9 | sparcv9b) > basic_machine=sparc-sun > ;; >- cydra) >+ cydra) > basic_machine=cydra-cydrome > ;; > orion) >@@ -1051,6 +1037,10 @@ > pmac | pmac-mpw) > basic_machine=powerpc-apple > ;; >+ c4x*) >+ basic_machine=c4x-none >+ os=-coff >+ ;; > *-unknown) > # Make sure to match an already-canonicalized machine name. > ;; >@@ -1113,12 +1103,11 @@ > | -chorusos* | -chorusrdb* \ > | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ > | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ >- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ >+ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ > | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ > | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ > | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ >- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ >- | -powermax* | -dnix* | -microbsd*) >+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*) > # Remember, each alternative MUST END IN *, to match a version number. > ;; > -qnx*) >@@ -1130,10 +1119,8 @@ > ;; > esac > ;; >- -nto-qnx*) >- ;; > -nto*) >- os=`echo $os | sed -e 's|nto|nto-qnx|'` >+ os=-nto-qnx > ;; > -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ > | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ >@@ -1185,7 +1172,7 @@ > os=-rtmk-nova > ;; > -ns2 ) >- os=-nextstep2 >+ os=-nextstep2 > ;; > -nsk*) > os=-nsk >@@ -1224,8 +1211,8 @@ > -xenix) > os=-xenix > ;; >- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) >- os=-mint >+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) >+ os=-mint > ;; > -none) > ;; >@@ -1262,7 +1249,7 @@ > pdp10-*) > os=-tops20 > ;; >- pdp11-*) >+ pdp11-*) > os=-none > ;; > *-dec | vax-*) >@@ -1355,19 +1342,19 @@ > *-next) > os=-nextstep3 > ;; >- *-gould) >+ *-gould) > os=-sysv > ;; >- *-highlevel) >+ *-highlevel) > os=-bsd > ;; > *-encore) > os=-bsd > ;; >- *-sgi) >+ *-sgi) > os=-irix > ;; >- *-siemens) >+ *-siemens) > os=-sysv4 > ;; > *-masscomp) >diff -ur sodipodi-0.31/configure sodipodi-0.31.fix2/configure >--- sodipodi-0.31/configure 2003-02-22 08:58:15.000000000 -0500 >+++ sodipodi-0.31.fix2/configure 2003-03-14 11:38:27.000000000 -0500 >@@ -1,19 +1,11 @@ > #! /bin/sh > # Guess values for system-dependent variables and create Makefiles. >-# Generated by GNU Autoconf 2.53 for sodipodi 0.31. >+# Generated by GNU Autoconf 2.57 for sodipodi 0.31. > # > # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 > # Free Software Foundation, Inc. > # This configure script is free software; the Free Software Foundation > # gives unlimited permission to copy, distribute and modify it. >- >-if expr a : '\(a\)' >/dev/null 2>&1; then >- as_expr=expr >-else >- as_expr=false >-fi >- >- > ## --------------------- ## > ## M4sh Initialization. ## > ## --------------------- ## >@@ -22,11 +14,13 @@ > if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then > emulate sh > NULLCMD=: >+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which >+ # is contrary to our usage. Disable this feature. >+ alias -g '${1+"$@"}'='"$@"' > elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then > set -o posix > fi > >-# NLS nuisances. > # Support unset when possible. > if (FOO=FOO; unset FOO) >/dev/null 2>&1; then > as_unset=unset >@@ -34,34 +28,42 @@ > as_unset=false > fi > >-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && >- { $as_unset LANG || test "${LANG+set}" != set; } || >- { LANG=C; export LANG; } >-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && >- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || >- { LC_ALL=C; export LC_ALL; } >-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && >- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || >- { LC_TIME=C; export LC_TIME; } >-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && >- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || >- { LC_CTYPE=C; export LC_CTYPE; } >-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && >- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || >- { LANGUAGE=C; export LANGUAGE; } >-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && >- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || >- { LC_COLLATE=C; export LC_COLLATE; } >-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && >- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || >- { LC_NUMERIC=C; export LC_NUMERIC; } >-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && >- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || >- { LC_MESSAGES=C; export LC_MESSAGES; } >+ >+# Work around bugs in pre-3.0 UWIN ksh. >+$as_unset ENV MAIL MAILPATH >+PS1='$ ' >+PS2='> ' >+PS4='+ ' >+ >+# NLS nuisances. >+for as_var in \ >+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ >+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ >+ LC_TELEPHONE LC_TIME >+do >+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then >+ eval $as_var=C; export $as_var >+ else >+ $as_unset $as_var >+ fi >+done >+ >+# Required to use basename. >+if expr a : '\(a\)' >/dev/null 2>&1; then >+ as_expr=expr >+else >+ as_expr=false >+fi >+ >+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then >+ as_basename=basename >+else >+ as_basename=false >+fi > > > # Name of the executable. >-as_me=`(basename "$0") 2>/dev/null || >+as_me=`$as_basename "$0" || > $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ > X"$0" : 'X\(//\)$' \| \ > X"$0" : 'X\(/\)$' \| \ >@@ -72,6 +74,7 @@ > /^X\/\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` > >+ > # PATH needs CR, and LINENO needs CR and PATH. > # Avoid depending upon Character Ranges. > as_cr_letters='abcdefghijklmnopqrstuvwxyz' >@@ -82,15 +85,15 @@ > > # The user is always right. > if test "${PATH_SEPARATOR+set}" != set; then >- echo "#! /bin/sh" >conftest.sh >- echo "exit 0" >>conftest.sh >- chmod +x conftest.sh >- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then >+ echo "#! /bin/sh" >conf$$.sh >+ echo "exit 0" >>conf$$.sh >+ chmod +x conf$$.sh >+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then > PATH_SEPARATOR=';' > else > PATH_SEPARATOR=: > fi >- rm -f conftest.sh >+ rm -f conf$$.sh > fi > > >@@ -138,6 +141,8 @@ > as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` > test "x$as_lineno_1" != "x$as_lineno_2" && > test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then >+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } >+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } > CONFIG_SHELL=$as_dir/$as_base > export CONFIG_SHELL > exec "$CONFIG_SHELL" "$0" ${1+"$@"} >@@ -210,6 +215,12 @@ > fi > rm -f conf$$ conf$$.exe conf$$.file > >+if mkdir -p . 2>/dev/null; then >+ as_mkdir_p=: >+else >+ as_mkdir_p=false >+fi >+ > as_executable_p="test -f" > > # Sed expression to map a string onto a valid CPP name. >@@ -226,7 +237,7 @@ > IFS=" $as_nl" > > # CDPATH. >-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } >+$as_unset CDPATH > > > # Name of the host. >@@ -240,6 +251,7 @@ > # Initializations. > # > ac_default_prefix=/usr/local >+ac_config_libobj_dir=. > cross_compiling=no > subdirs= > MFLAGS= >@@ -296,6 +308,8 @@ > # include <unistd.h> > #endif" > >+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CCAS CCASFLAGS RANLIB ac_ct_RANLIB CPP EGREP GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG USE_POPT_TRUE USE_POPT_FALSE FONTCONFIG_CFLAGS FONTCONFIG_LIBS USE_FONTCONFIG_TRUE USE_FONTCONFIG_FALSE USE_XFT_TRUE USE_XFT_FALSE GNOME_PRINT_CFLAGS GNOME_PRINT_LIBS USE_GNOME_PRINT_TRUE USE_GNOME_PRINT_FALSE SODIPODI_CFLAGS SODIPODI_LIBS USE_MMX_TRUE USE_MMX_FALSE LIBOBJS LTLIBOBJS' >+ac_subst_files='' > > # Initialize some variables set by options. > ac_init_help= >@@ -719,6 +733,9 @@ > { (exit 1); exit 1; }; } > fi > fi >+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || >+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 >+ { (exit 1); exit 1; }; } > srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` > ac_env_build_alias_set=${build_alias+set} > ac_env_build_alias_value=$build_alias >@@ -894,7 +911,7 @@ > # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be > # absolute. > ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` >-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` >+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` > ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` > ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` > >@@ -921,7 +938,7 @@ > if $ac_init_version; then > cat <<\_ACEOF > sodipodi configure 0.31 >-generated by GNU Autoconf 2.53 >+generated by GNU Autoconf 2.57 > > Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 > Free Software Foundation, Inc. >@@ -936,7 +953,7 @@ > running configure, to aid debugging if configure makes a mistake. > > It was created by sodipodi $as_me 0.31, which was >-generated by GNU Autoconf 2.53. Invocation command line was >+generated by GNU Autoconf 2.57. Invocation command line was > > $ $0 $@ > >@@ -988,27 +1005,54 @@ > > # Keep a trace of the command line. > # Strip out --no-create and --no-recursion so they do not pile up. >+# Strip out --silent because we don't want to record it for future runs. > # Also quote any args containing shell meta-characters. >+# Make two passes to allow for proper duplicate-argument suppression. > ac_configure_args= >+ac_configure_args0= >+ac_configure_args1= > ac_sep= >-for ac_arg >+ac_must_keep_next=false >+for ac_pass in 1 2 > do >- case $ac_arg in >- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ >- | --no-cr | --no-c | -n ) continue ;; >- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ >- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) >- continue ;; >- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) >- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; >- esac >- case " $ac_configure_args " in >- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. >- *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" >- ac_sep=" " ;; >- esac >- # Get rid of the leading space. >+ for ac_arg >+ do >+ case $ac_arg in >+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; >+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ >+ | -silent | --silent | --silen | --sile | --sil) >+ continue ;; >+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) >+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; >+ esac >+ case $ac_pass in >+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; >+ 2) >+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" >+ if test $ac_must_keep_next = true; then >+ ac_must_keep_next=false # Got value, back to normal. >+ else >+ case $ac_arg in >+ *=* | --config-cache | -C | -disable-* | --disable-* \ >+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ >+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ >+ | -with-* | --with-* | -without-* | --without-* | --x) >+ case "$ac_configure_args0 " in >+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; >+ esac >+ ;; >+ -* ) ac_must_keep_next=true ;; >+ esac >+ fi >+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" >+ # Get rid of the leading space. >+ ac_sep=" " >+ ;; >+ esac >+ done > done >+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } >+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } > > # When interrupted or exit'd, cleanup temporary files, and complete > # config.log. We remove comments because anyway the quotes in there >@@ -1019,6 +1063,7 @@ > # Save into config.log some information that might help in debugging. > { > echo >+ > cat <<\_ASBOX > ## ---------------- ## > ## Cache variables. ## >@@ -1041,6 +1086,35 @@ > esac; > } > echo >+ >+ cat <<\_ASBOX >+## ----------------- ## >+## Output variables. ## >+## ----------------- ## >+_ASBOX >+ echo >+ for ac_var in $ac_subst_vars >+ do >+ eval ac_val=$`echo $ac_var` >+ echo "$ac_var='"'"'$ac_val'"'"'" >+ done | sort >+ echo >+ >+ if test -n "$ac_subst_files"; then >+ cat <<\_ASBOX >+## ------------- ## >+## Output files. ## >+## ------------- ## >+_ASBOX >+ echo >+ for ac_var in $ac_subst_files >+ do >+ eval ac_val=$`echo $ac_var` >+ echo "$ac_var='"'"'$ac_val'"'"'" >+ done | sort >+ echo >+ fi >+ > if test -s confdefs.h; then > cat <<\_ASBOX > ## ----------- ## >@@ -1048,7 +1122,7 @@ > ## ----------- ## > _ASBOX > echo >- sed "/^$/d" confdefs.h >+ sed "/^$/d" confdefs.h | sort > echo > fi > test "$ac_signal" != 0 && >@@ -1214,6 +1288,7 @@ > > > >+ > am__api_version="1.6" > ac_aux_dir= > for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do >@@ -1429,15 +1504,15 @@ > test -n "$AWK" && break > done > >-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 >-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 >+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 >+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 > set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` > if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then > echo $ECHO_N "(cached) $ECHO_C" >&6 > else > cat >conftest.make <<\_ACEOF > all: >- @echo 'ac_maketemp="${MAKE}"' >+ @echo 'ac_maketemp="$(MAKE)"' > _ACEOF > # GNU make sometimes prints "make[1]: Entering...", which would confuse us. > eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` >@@ -1597,7 +1672,7 @@ > > # Add the stamp file to the list of files AC keeps track of, > # along with our hook. >-ac_config_headers="$ac_config_headers config.h" >+ ac_config_headers="$ac_config_headers config.h" > > > >@@ -1627,6 +1702,7 @@ > INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -k -u -c $(top_builddir)/po/.intltool-merge-cache' >+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -p' > INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' >@@ -1635,7 +1711,10 @@ > INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' > INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' >- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' >+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -s -u -c $(top_builddir)/po/.intltool-merge-cache' >+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' >+ >+ > > > >@@ -1720,7 +1799,7 @@ > > # Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT. > >-ac_config_commands="$ac_config_commands default-1" >+ ac_config_commands="$ac_config_commands default-1" > > > >@@ -1790,7 +1869,7 @@ > rmdir .deps 2>/dev/null > > >-ac_config_commands="$ac_config_commands depfiles" >+ ac_config_commands="$ac_config_commands depfiles" > > > am_make=${MAKE-make} >@@ -2056,9 +2135,7 @@ > # However, it has the same basename, so the bogon will be chosen > # first if we set CC to just the basename; use the full file name. > shift >- set dummy "$as_dir/$ac_word" ${1+"$@"} >- shift >- ac_cv_prog_CC="$@" >+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" > fi > fi > fi >@@ -2163,8 +2240,10 @@ > fi > > >-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 >-echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} >+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH >+See \`config.log' for more details." >&5 >+echo "$as_me: error: no acceptable C compiler found in \$PATH >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > > # Provide some information about the compiler. >@@ -2189,14 +2268,12 @@ > > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2206,7 +2283,7 @@ > } > _ACEOF > ac_clean_files_save=$ac_clean_files >-ac_clean_files="$ac_clean_files a.out a.exe" >+ac_clean_files="$ac_clean_files a.out a.exe b.out" > # Try to create an executable without -o first, disregard a.out. > # It will help us diagnose broken compilers, and finding out an intuition > # of exeext. >@@ -2225,26 +2302,39 @@ > # Be careful to initialize this variable, since it used to be cached. > # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. > ac_cv_exeext= >-for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; >- ls a.out conftest 2>/dev/null; >- ls a.* conftest.* 2>/dev/null`; do >+# b.out is created by i960 compilers. >+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out >+do >+ test -f "$ac_file" || continue > case $ac_file in >- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; >- a.out ) # We found the default executable, but exeext='' is most >- # certainly right. >- break;; >- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` >- # FIXME: I believe we export ac_cv_exeext for Libtool --akim. >- export ac_cv_exeext >- break;; >- * ) break;; >+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) >+ ;; >+ conftest.$ac_ext ) >+ # This is the source file. >+ ;; >+ [ab].out ) >+ # We found the default executable, but exeext='' is most >+ # certainly right. >+ break;; >+ *.* ) >+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` >+ # FIXME: I believe we export ac_cv_exeext for Libtool, >+ # but it would be cool to find out if it's true. Does anybody >+ # maintain Libtool? --akim. >+ export ac_cv_exeext >+ break;; >+ * ) >+ break;; > esac > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 >-echo "$as_me: error: C compiler cannot create executables" >&2;} >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables >+See \`config.log' for more details." >&5 >+echo "$as_me: error: C compiler cannot create executables >+See \`config.log' for more details." >&2;} > { (exit 77); exit 77; }; } > fi > >@@ -2271,9 +2361,11 @@ > cross_compiling=yes > else > { { echo "$as_me:$LINENO: error: cannot run C compiled programs. >-If you meant to cross compile, use \`--host'." >&5 >+If you meant to cross compile, use \`--host'. >+See \`config.log' for more details." >&5 > echo "$as_me: error: cannot run C compiled programs. >-If you meant to cross compile, use \`--host'." >&2;} >+If you meant to cross compile, use \`--host'. >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > fi >@@ -2281,7 +2373,7 @@ > echo "$as_me:$LINENO: result: yes" >&5 > echo "${ECHO_T}yes" >&6 > >-rm -f a.out a.exe conftest$ac_cv_exeext >+rm -f a.out a.exe conftest$ac_cv_exeext b.out > ac_clean_files=$ac_clean_files_save > # Check the compiler produces executables we can run. If not, either > # the compiler is broken, or we cross compile. >@@ -2301,9 +2393,10 @@ > # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will > # work properly (i.e., refer to `conftest.exe'), while it won't with > # `rm'. >-for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do >+for ac_file in conftest.exe conftest conftest.*; do >+ test -f "$ac_file" || continue > case $ac_file in >- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; >+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; > *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` > export ac_cv_exeext > break;; >@@ -2311,8 +2404,10 @@ > esac > done > else >- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 >-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} >+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -2330,14 +2425,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2354,16 +2447,19 @@ > (exit $ac_status); }; then > for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do > case $ac_file in >- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; >+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; > *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` > break;; > esac > done > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 >-echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile >+See \`config.log' for more details." >&5 >+echo "$as_me: error: cannot compute suffix of object files: cannot compile >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -2380,14 +2476,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2414,7 +2508,8 @@ > ac_compiler_gnu=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_compiler_gnu=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -2434,14 +2529,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2465,7 +2558,8 @@ > ac_cv_prog_cc_g=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_prog_cc_g=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -2487,6 +2581,102 @@ > CFLAGS= > fi > fi >+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 >+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 >+if test "${ac_cv_prog_cc_stdc+set}" = set; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ ac_cv_prog_cc_stdc=no >+ac_save_CC=$CC >+cat >conftest.$ac_ext <<_ACEOF >+#line $LINENO "configure" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#include <stdarg.h> >+#include <stdio.h> >+#include <sys/types.h> >+#include <sys/stat.h> >+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ >+struct buf { int x; }; >+FILE * (*rcsopen) (struct buf *, struct stat *, int); >+static char *e (p, i) >+ char **p; >+ int i; >+{ >+ return p[i]; >+} >+static char *f (char * (*g) (char **, int), char **p, ...) >+{ >+ char *s; >+ va_list v; >+ va_start (v,p); >+ s = g (p, va_arg (v,int)); >+ va_end (v); >+ return s; >+} >+int test (int i, double x); >+struct s1 {int (*f) (int a);}; >+struct s2 {int (*f) (double a);}; >+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); >+int argc; >+char **argv; >+int >+main () >+{ >+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; >+ ; >+ return 0; >+} >+_ACEOF >+# Don't try gcc -ansi; that turns off useful extensions and >+# breaks some systems' header files. >+# AIX -qlanglvl=ansi >+# Ultrix and OSF/1 -std1 >+# HP-UX 10.20 and later -Ae >+# HP-UX older versions -Aa -D_HPUX_SOURCE >+# SVR4 -Xc -D__EXTENSIONS__ >+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" >+do >+ CC="$ac_save_CC $ac_arg" >+ rm -f conftest.$ac_objext >+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >+ (eval $ac_compile) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); } && >+ { ac_try='test -s conftest.$ac_objext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then >+ ac_cv_prog_cc_stdc=$ac_arg >+break >+else >+ echo "$as_me: failed program was:" >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+fi >+rm -f conftest.$ac_objext >+done >+rm -f conftest.$ac_ext conftest.$ac_objext >+CC=$ac_save_CC >+ >+fi >+ >+case "x$ac_cv_prog_cc_stdc" in >+ x|xno) >+ echo "$as_me:$LINENO: result: none needed" >&5 >+echo "${ECHO_T}none needed" >&6 ;; >+ *) >+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 >+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 >+ CC="$CC $ac_cv_prog_cc_stdc" ;; >+esac >+ > # Some people use a C++ compiler to compile C. Since we use `exit', > # in C++ we need to declare it. In case someone uses the same compiler > # for both compiling C and C++ we need to have the C++ compiler decide >@@ -2519,15 +2709,13 @@ > do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2551,20 +2739,19 @@ > : > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > continue > fi > rm -f conftest.$ac_objext conftest.$ac_ext > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2588,7 +2775,8 @@ > break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done >@@ -2601,7 +2789,8 @@ > > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > ac_ext=c >@@ -2690,7 +2879,11 @@ > LIBS="-lcposix $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -2699,12 +2892,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char strerror (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -2728,7 +2915,8 @@ > ac_cv_lib_cposix_strerror=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_cposix_strerror=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -2946,9 +3134,7 @@ > # However, it has the same basename, so the bogon will be chosen > # first if we set CC to just the basename; use the full file name. > shift >- set dummy "$as_dir/$ac_word" ${1+"$@"} >- shift >- ac_cv_prog_CC="$@" >+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" > fi > fi > fi >@@ -3053,8 +3239,10 @@ > fi > > >-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 >-echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} >+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH >+See \`config.log' for more details." >&5 >+echo "$as_me: error: no acceptable C compiler found in \$PATH >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > > # Provide some information about the compiler. >@@ -3084,14 +3272,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -3118,7 +3304,8 @@ > ac_compiler_gnu=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_compiler_gnu=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -3138,14 +3325,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -3169,7 +3354,8 @@ > ac_cv_prog_cc_g=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_prog_cc_g=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -3191,16 +3377,67 @@ > CFLAGS= > fi > fi >-# Some people use a C++ compiler to compile C. Since we use `exit', >-# in C++ we need to declare it. In case someone uses the same compiler >-# for both compiling C and C++ we need to have the C++ compiler decide >-# the declaration of exit, since it's the most demanding environment. >+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 >+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 >+if test "${ac_cv_prog_cc_stdc+set}" = set; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ ac_cv_prog_cc_stdc=no >+ac_save_CC=$CC > cat >conftest.$ac_ext <<_ACEOF >-#ifndef __cplusplus >- choke me >-#endif >+#line $LINENO "configure" >+/* confdefs.h. */ > _ACEOF >-rm -f conftest.$ac_objext >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#include <stdarg.h> >+#include <stdio.h> >+#include <sys/types.h> >+#include <sys/stat.h> >+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ >+struct buf { int x; }; >+FILE * (*rcsopen) (struct buf *, struct stat *, int); >+static char *e (p, i) >+ char **p; >+ int i; >+{ >+ return p[i]; >+} >+static char *f (char * (*g) (char **, int), char **p, ...) >+{ >+ char *s; >+ va_list v; >+ va_start (v,p); >+ s = g (p, va_arg (v,int)); >+ va_end (v); >+ return s; >+} >+int test (int i, double x); >+struct s1 {int (*f) (int a);}; >+struct s2 {int (*f) (double a);}; >+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); >+int argc; >+char **argv; >+int >+main () >+{ >+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; >+ ; >+ return 0; >+} >+_ACEOF >+# Don't try gcc -ansi; that turns off useful extensions and >+# breaks some systems' header files. >+# AIX -qlanglvl=ansi >+# Ultrix and OSF/1 -std1 >+# HP-UX 10.20 and later -Ae >+# HP-UX older versions -Aa -D_HPUX_SOURCE >+# SVR4 -Xc -D__EXTENSIONS__ >+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" >+do >+ CC="$ac_save_CC $ac_arg" >+ rm -f conftest.$ac_objext > if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 > (eval $ac_compile) 2>&5 > ac_status=$? >@@ -3212,26 +3449,69 @@ > ac_status=$? > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); }; }; then >- for ac_declaration in \ >- ''\ >- '#include <stdlib.h>' \ >- 'extern "C" void std::exit (int) throw (); using std::exit;' \ >- 'extern "C" void std::exit (int); using std::exit;' \ >- 'extern "C" void exit (int) throw ();' \ >- 'extern "C" void exit (int);' \ >+ ac_cv_prog_cc_stdc=$ac_arg >+break >+else >+ echo "$as_me: failed program was:" >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+fi >+rm -f conftest.$ac_objext >+done >+rm -f conftest.$ac_ext conftest.$ac_objext >+CC=$ac_save_CC >+ >+fi >+ >+case "x$ac_cv_prog_cc_stdc" in >+ x|xno) >+ echo "$as_me:$LINENO: result: none needed" >&5 >+echo "${ECHO_T}none needed" >&6 ;; >+ *) >+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 >+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 >+ CC="$CC $ac_cv_prog_cc_stdc" ;; >+esac >+ >+# Some people use a C++ compiler to compile C. Since we use `exit', >+# in C++ we need to declare it. In case someone uses the same compiler >+# for both compiling C and C++ we need to have the C++ compiler decide >+# the declaration of exit, since it's the most demanding environment. >+cat >conftest.$ac_ext <<_ACEOF >+#ifndef __cplusplus >+ choke me >+#endif >+_ACEOF >+rm -f conftest.$ac_objext >+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >+ (eval $ac_compile) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); } && >+ { ac_try='test -s conftest.$ac_objext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then >+ for ac_declaration in \ >+ ''\ >+ '#include <stdlib.h>' \ >+ 'extern "C" void std::exit (int) throw (); using std::exit;' \ >+ 'extern "C" void std::exit (int); using std::exit;' \ >+ 'extern "C" void exit (int) throw ();' \ >+ 'extern "C" void exit (int);' \ > 'void exit (int);' > do > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -3255,20 +3535,19 @@ > : > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > continue > fi > rm -f conftest.$ac_objext conftest.$ac_ext > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_declaration >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -3292,7 +3571,8 @@ > break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done >@@ -3305,7 +3585,8 @@ > > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > ac_ext=c >@@ -3405,7 +3686,11 @@ > CC="$ac_save_CC $ac_arg" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdarg.h> > #include <stdio.h> > #include <sys/types.h> >@@ -3435,12 +3720,6 @@ > int argc; > char **argv; > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -3466,7 +3745,8 @@ > am_cv_prog_cc_stdc="$ac_arg"; break > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > fi > rm -f conftest.$ac_objext conftest.$ac_ext > done >@@ -3493,6 +3773,86 @@ > : ${CCASFLAGS='$(CFLAGS)'} > > >+if test -n "$ac_tool_prefix"; then >+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. >+set dummy ${ac_tool_prefix}ranlib; ac_word=$2 >+echo "$as_me:$LINENO: checking for $ac_word" >&5 >+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 >+if test "${ac_cv_prog_RANLIB+set}" = set; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ if test -n "$RANLIB"; then >+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. >+else >+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR >+for as_dir in $PATH >+do >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" >+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+ fi >+done >+done >+ >+fi >+fi >+RANLIB=$ac_cv_prog_RANLIB >+if test -n "$RANLIB"; then >+ echo "$as_me:$LINENO: result: $RANLIB" >&5 >+echo "${ECHO_T}$RANLIB" >&6 >+else >+ echo "$as_me:$LINENO: result: no" >&5 >+echo "${ECHO_T}no" >&6 >+fi >+ >+fi >+if test -z "$ac_cv_prog_RANLIB"; then >+ ac_ct_RANLIB=$RANLIB >+ # Extract the first word of "ranlib", so it can be a program name with args. >+set dummy ranlib; ac_word=$2 >+echo "$as_me:$LINENO: checking for $ac_word" >&5 >+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 >+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ if test -n "$ac_ct_RANLIB"; then >+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. >+else >+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR >+for as_dir in $PATH >+do >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_RANLIB="ranlib" >+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+ fi >+done >+done >+ >+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" >+fi >+fi >+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB >+if test -n "$ac_ct_RANLIB"; then >+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 >+echo "${ECHO_T}$ac_ct_RANLIB" >&6 >+else >+ echo "$as_me:$LINENO: result: no" >&5 >+echo "${ECHO_T}no" >&6 >+fi >+ >+ RANLIB=$ac_ct_RANLIB >+else >+ RANLIB="$ac_cv_prog_RANLIB" >+fi >+ > ac_ext=c > ac_cpp='$CPP $CPPFLAGS' > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' >@@ -3516,18 +3876,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3544,7 +3914,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -3554,13 +3925,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3578,7 +3953,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -3607,18 +3983,28 @@ > do > # Use a header file that comes with gcc, so configuring glibc > # with a fresh cross-compiler works. >+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ # <limits.h> exists even on freestanding compilers. > # On the NeXT, cc -E runs the code through the compiler's parser, > # not just through cpp. "Syntax error" is here to catch this case. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >-#include <assert.h> >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > Syntax error > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3635,7 +4021,8 @@ > : > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Broken: fails on valid input. > continue > fi >@@ -3645,13 +4032,17 @@ > # can be detected and how. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ac_nonexistent.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -3669,7 +4060,8 @@ > continue > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > # Passes both tests. > ac_preproc_ok=: > break >@@ -3682,8 +4074,10 @@ > if $ac_preproc_ok; then > : > else >- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 >-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} >+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check >+See \`config.log' for more details." >&5 >+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check >+See \`config.log' for more details." >&2;} > { (exit 1); exit 1; }; } > fi > >@@ -3694,6 +4088,21 @@ > ac_compiler_gnu=$ac_cv_c_compiler_gnu > > >+echo "$as_me:$LINENO: checking for egrep" >&5 >+echo $ECHO_N "checking for egrep... $ECHO_C" >&6 >+if test "${ac_cv_prog_egrep+set}" = set; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1 >+ then ac_cv_prog_egrep='grep -E' >+ else ac_cv_prog_egrep='egrep' >+ fi >+fi >+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 >+echo "${ECHO_T}$ac_cv_prog_egrep" >&6 >+ EGREP=$ac_cv_prog_egrep >+ >+ > echo "$as_me:$LINENO: checking for ANSI C header files" >&5 > echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 > if test "${ac_cv_header_stdc+set}" = set; then >@@ -3701,48 +4110,59 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > #include <stdarg.h> > #include <string.h> > #include <float.h> > >+int >+main () >+{ >+ >+ ; >+ return 0; >+} > _ACEOF >-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 >- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 >+rm -f conftest.$ac_objext >+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >+ (eval $ac_compile) 2>&5 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >- rm -f conftest.er1 >- cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } >/dev/null; then >- if test -s conftest.err; then >- ac_cpp_err=$ac_c_preproc_warn_flag >- else >- ac_cpp_err= >- fi >-else >- ac_cpp_err=yes >-fi >-if test -z "$ac_cpp_err"; then >+ (exit $ac_status); } && >+ { ac_try='test -s conftest.$ac_objext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then > ac_cv_header_stdc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >- ac_cv_header_stdc=no >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+ac_cv_header_stdc=no > fi >-rm -f conftest.err conftest.$ac_ext >+rm -f conftest.$ac_objext conftest.$ac_ext > > if test $ac_cv_header_stdc = yes; then > # SunOS 4.x string.h does not declare mem*, contrary to ANSI. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <string.h> > > _ACEOF > if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | >- egrep "memchr" >/dev/null 2>&1; then >+ $EGREP "memchr" >/dev/null 2>&1; then > : > else > ac_cv_header_stdc=no >@@ -3755,12 +4175,16 @@ > # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <stdlib.h> > > _ACEOF > if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | >- egrep "free" >/dev/null 2>&1; then >+ $EGREP "free" >/dev/null 2>&1; then > : > else > ac_cv_header_stdc=no >@@ -3776,13 +4200,18 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <ctype.h> > #if ((' ' & 0x0FF) == 0x020) > # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') > # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) > #else >-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ >+# define ISLOWER(c) \ >+ (('a' <= (c) && (c) <= 'i') \ > || ('j' <= (c) && (c) <= 'r') \ > || ('s' <= (c) && (c) <= 'z')) > # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) >@@ -3815,11 +4244,12 @@ > else > echo "$as_me: program exited with status $ac_status" >&5 > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ( exit $ac_status ) > ac_cv_header_stdc=no > fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext > fi > fi > fi >@@ -3857,357 +4287,33 @@ > _ACEOF > > ALL_LINGUAS="am az ca cs da de el es et fr ga gl hu it ja no ru sk sl sv tr uk pl pt_BR pt zh_CN" >-if test -n "$ac_tool_prefix"; then >- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. >-set dummy ${ac_tool_prefix}ranlib; ac_word=$2 >-echo "$as_me:$LINENO: checking for $ac_word" >&5 >-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 >-if test "${ac_cv_prog_RANLIB+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- if test -n "$RANLIB"; then >- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. >-else >-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR >-for as_dir in $PATH >-do >- IFS=$as_save_IFS >- test -z "$as_dir" && as_dir=. >- for ac_exec_ext in '' $ac_executable_extensions; do >- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" >- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 >- break 2 >- fi >-done >-done >+# On IRIX 5.3, sys/types and inttypes.h are conflicting. > >-fi >-fi >-RANLIB=$ac_cv_prog_RANLIB >-if test -n "$RANLIB"; then >- echo "$as_me:$LINENO: result: $RANLIB" >&5 >-echo "${ECHO_T}$RANLIB" >&6 >+ >+ >+ >+ >+ >+ >+ >+ >+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ >+ inttypes.h stdint.h unistd.h >+do >+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` >+echo "$as_me:$LINENO: checking for $ac_header" >&5 >+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >+if eval "test \"\${$as_ac_Header+set}\" = set"; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 > else >- echo "$as_me:$LINENO: result: no" >&5 >-echo "${ECHO_T}no" >&6 >-fi >- >-fi >-if test -z "$ac_cv_prog_RANLIB"; then >- ac_ct_RANLIB=$RANLIB >- # Extract the first word of "ranlib", so it can be a program name with args. >-set dummy ranlib; ac_word=$2 >-echo "$as_me:$LINENO: checking for $ac_word" >&5 >-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 >-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- if test -n "$ac_ct_RANLIB"; then >- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. >-else >-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR >-for as_dir in $PATH >-do >- IFS=$as_save_IFS >- test -z "$as_dir" && as_dir=. >- for ac_exec_ext in '' $ac_executable_extensions; do >- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >- ac_cv_prog_ac_ct_RANLIB="ranlib" >- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 >- break 2 >- fi >-done >-done >- >- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" >-fi >-fi >-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB >-if test -n "$ac_ct_RANLIB"; then >- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 >-echo "${ECHO_T}$ac_ct_RANLIB" >&6 >-else >- echo "$as_me:$LINENO: result: no" >&5 >-echo "${ECHO_T}no" >&6 >-fi >- >- RANLIB=$ac_ct_RANLIB >-else >- RANLIB="$ac_cv_prog_RANLIB" >-fi >- >-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 >-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 >-if test "${ac_cv_prog_cc_stdc+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- ac_cv_prog_cc_stdc=no >-ac_save_CC=$CC >-cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-#include <stdarg.h> >-#include <stdio.h> >-#include <sys/types.h> >-#include <sys/stat.h> >-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ >-struct buf { int x; }; >-FILE * (*rcsopen) (struct buf *, struct stat *, int); >-static char *e (p, i) >- char **p; >- int i; >-{ >- return p[i]; >-} >-static char *f (char * (*g) (char **, int), char **p, ...) >-{ >- char *s; >- va_list v; >- va_start (v,p); >- s = g (p, va_arg (v,int)); >- va_end (v); >- return s; >-} >-int test (int i, double x); >-struct s1 {int (*f) (int a);}; >-struct s2 {int (*f) (double a);}; >-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); >-int argc; >-char **argv; >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ >-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; >- ; >- return 0; >-} >-_ACEOF >-# Don't try gcc -ansi; that turns off useful extensions and >-# breaks some systems' header files. >-# AIX -qlanglvl=ansi >-# Ultrix and OSF/1 -std1 >-# HP-UX 10.20 and later -Ae >-# HP-UX older versions -Aa -D_HPUX_SOURCE >-# SVR4 -Xc -D__EXTENSIONS__ >-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" >-do >- CC="$ac_save_CC $ac_arg" >- rm -f conftest.$ac_objext >-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >- (eval $ac_compile) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest.$ac_objext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_cv_prog_cc_stdc=$ac_arg >-break >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-fi >-rm -f conftest.$ac_objext >-done >-rm -f conftest.$ac_ext conftest.$ac_objext >-CC=$ac_save_CC >- >-fi >- >-case "x$ac_cv_prog_cc_stdc" in >- x|xno) >- echo "$as_me:$LINENO: result: none needed" >&5 >-echo "${ECHO_T}none needed" >&6 ;; >- *) >- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 >-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 >- CC="$CC $ac_cv_prog_cc_stdc" ;; >-esac >- >-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 >-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 >-if test "${ac_cv_c_const+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ >-/* FIXME: Include the comments suggested by Paul. */ >-#ifndef __cplusplus >- /* Ultrix mips cc rejects this. */ >- typedef int charset[2]; >- const charset x; >- /* SunOS 4.1.1 cc rejects this. */ >- char const *const *ccp; >- char **p; >- /* NEC SVR4.0.2 mips cc rejects this. */ >- struct point {int x, y;}; >- static struct point const zero = {0,0}; >- /* AIX XL C 1.02.0.0 rejects this. >- It does not let you subtract one const X* pointer from another in >- an arm of an if-expression whose if-part is not a constant >- expression */ >- const char *g = "string"; >- ccp = &g + (g ? g-g : 0); >- /* HPUX 7.0 cc rejects these. */ >- ++ccp; >- p = (char**) ccp; >- ccp = (char const *const *) p; >- { /* SCO 3.2v4 cc rejects this. */ >- char *t; >- char const *s = 0 ? (char *) 0 : (char const *) 0; >- >- *t++ = 0; >- } >- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ >- int x[] = {25, 17}; >- const int *foo = &x[0]; >- ++foo; >- } >- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ >- typedef const int *iptr; >- iptr p = 0; >- ++p; >- } >- { /* AIX XL C 1.02.0.0 rejects this saying >- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ >- struct s { int j; const int *ap[3]; }; >- struct s *b; b->j = 5; >- } >- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ >- const int foo = 10; >- } >-#endif >- >- ; >- return 0; >-} >-_ACEOF >-rm -f conftest.$ac_objext >-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >- (eval $ac_compile) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest.$ac_objext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_cv_c_const=yes >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-ac_cv_c_const=no >-fi >-rm -f conftest.$ac_objext conftest.$ac_ext >-fi >-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 >-echo "${ECHO_T}$ac_cv_c_const" >&6 >-if test $ac_cv_c_const = no; then >- >-cat >>confdefs.h <<\_ACEOF >-#define const >-_ACEOF >- >-fi >- >-echo "$as_me:$LINENO: checking for inline" >&5 >-echo $ECHO_N "checking for inline... $ECHO_C" >&6 >-if test "${ac_cv_c_inline+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- ac_cv_c_inline=no >-for ac_kw in inline __inline__ __inline; do >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-#ifndef __cplusplus >-static $ac_kw int static_foo () {return 0; } >-$ac_kw int foo () {return 0; } >-#endif >- >-_ACEOF >-rm -f conftest.$ac_objext >-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >- (eval $ac_compile) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest.$ac_objext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_cv_c_inline=$ac_kw; break >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-fi >-rm -f conftest.$ac_objext conftest.$ac_ext >-done >- >-fi >-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 >-echo "${ECHO_T}$ac_cv_c_inline" >&6 >-case $ac_cv_c_inline in >- inline | yes) ;; >- no) >-cat >>confdefs.h <<\_ACEOF >-#define inline >-_ACEOF >- ;; >- *) cat >>confdefs.h <<_ACEOF >-#define inline $ac_cv_c_inline >-_ACEOF >- ;; >-esac >- >-# On IRIX 5.3, sys/types and inttypes.h are conflicting. >- >- >- >- >- >- >- >- >- >-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ >- inttypes.h stdint.h unistd.h >-do >-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` >-echo "$as_me:$LINENO: checking for $ac_header" >&5 >-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >-if eval "test \"\${$as_ac_Header+set}\" = set"; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-$ac_includes_default >+ cat >conftest.$ac_ext <<_ACEOF >+#line $LINENO "configure" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+$ac_includes_default > > #include <$ac_header> > _ACEOF >@@ -4226,820 +4332,27 @@ > eval "$as_ac_Header=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-eval "$as_ac_Header=no" >-fi >-rm -f conftest.$ac_objext conftest.$ac_ext >-fi >-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 >-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 >-if test `eval echo '${'$as_ac_Header'}'` = yes; then >- cat >>confdefs.h <<_ACEOF >-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 >-_ACEOF >- >-fi >+sed 's/^/| /' conftest.$ac_ext >&5 > >-done >- >- >-echo "$as_me:$LINENO: checking for off_t" >&5 >-echo $ECHO_N "checking for off_t... $ECHO_C" >&6 >-if test "${ac_cv_type_off_t+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-$ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ >-if ((off_t *) 0) >- return 0; >-if (sizeof (off_t)) >- return 0; >- ; >- return 0; >-} >-_ACEOF >-rm -f conftest.$ac_objext >-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >- (eval $ac_compile) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest.$ac_objext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_cv_type_off_t=yes >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-ac_cv_type_off_t=no >-fi >-rm -f conftest.$ac_objext conftest.$ac_ext >-fi >-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 >-echo "${ECHO_T}$ac_cv_type_off_t" >&6 >-if test $ac_cv_type_off_t = yes; then >- : >-else >- >-cat >>confdefs.h <<_ACEOF >-#define off_t long >-_ACEOF >- >-fi >- >-echo "$as_me:$LINENO: checking for size_t" >&5 >-echo $ECHO_N "checking for size_t... $ECHO_C" >&6 >-if test "${ac_cv_type_size_t+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-$ac_includes_default >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ >-if ((size_t *) 0) >- return 0; >-if (sizeof (size_t)) >- return 0; >- ; >- return 0; >-} >-_ACEOF >-rm -f conftest.$ac_objext >-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >- (eval $ac_compile) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest.$ac_objext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_cv_type_size_t=yes >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-ac_cv_type_size_t=no >-fi >-rm -f conftest.$ac_objext conftest.$ac_ext >-fi >-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 >-echo "${ECHO_T}$ac_cv_type_size_t" >&6 >-if test $ac_cv_type_size_t = yes; then >- : >-else >- >-cat >>confdefs.h <<_ACEOF >-#define size_t unsigned >-_ACEOF >- >-fi >- >-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works >-# for constant arguments. Useless! >-echo "$as_me:$LINENO: checking for working alloca.h" >&5 >-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 >-if test "${ac_cv_working_alloca_h+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-#include <alloca.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ >-char *p = (char *) alloca (2 * sizeof (int)); >- ; >- return 0; >-} >-_ACEOF >-rm -f conftest.$ac_objext conftest$ac_exeext >-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 >- (eval $ac_link) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest$ac_exeext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_cv_working_alloca_h=yes >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-ac_cv_working_alloca_h=no >-fi >-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >-fi >-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 >-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 >-if test $ac_cv_working_alloca_h = yes; then >- >-cat >>confdefs.h <<\_ACEOF >-#define HAVE_ALLOCA_H 1 >-_ACEOF >- >-fi >- >-echo "$as_me:$LINENO: checking for alloca" >&5 >-echo $ECHO_N "checking for alloca... $ECHO_C" >&6 >-if test "${ac_cv_func_alloca_works+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-#ifdef __GNUC__ >-# define alloca __builtin_alloca >-#else >-# ifdef _MSC_VER >-# include <malloc.h> >-# define alloca _alloca >-# else >-# if HAVE_ALLOCA_H >-# include <alloca.h> >-# else >-# ifdef _AIX >- #pragma alloca >-# else >-# ifndef alloca /* predefined by HP cc +Olibcalls */ >-char *alloca (); >-# endif >-# endif >-# endif >-# endif >-#endif >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ >-char *p = (char *) alloca (1); >- ; >- return 0; >-} >-_ACEOF >-rm -f conftest.$ac_objext conftest$ac_exeext >-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 >- (eval $ac_link) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest$ac_exeext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_cv_func_alloca_works=yes >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-ac_cv_func_alloca_works=no >-fi >-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >-fi >-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 >-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 >- >-if test $ac_cv_func_alloca_works = yes; then >- >-cat >>confdefs.h <<\_ACEOF >-#define HAVE_ALLOCA 1 >-_ACEOF >- >-else >- # The SVR3 libPW and SVR4 libucb both contain incompatible functions >-# that cause trouble. Some versions do not even contain alloca or >-# contain a buggy version. If you still want to use their alloca, >-# use ar to extract alloca.o from them instead of compiling alloca.c. >- >-ALLOCA=alloca.$ac_objext >- >-cat >>confdefs.h <<\_ACEOF >-#define C_ALLOCA 1 >-_ACEOF >- >- >-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 >-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 >-if test "${ac_cv_os_cray+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-#if defined(CRAY) && ! defined(CRAY2) >-webecray >-#else >-wenotbecray >-#endif >- >-_ACEOF >-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | >- egrep "webecray" >/dev/null 2>&1; then >- ac_cv_os_cray=yes >-else >- ac_cv_os_cray=no >-fi >-rm -f conftest* >- >-fi >-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 >-echo "${ECHO_T}$ac_cv_os_cray" >&6 >-if test $ac_cv_os_cray = yes; then >- for ac_func in _getb67 GETB67 getb67; do >- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` >-echo "$as_me:$LINENO: checking for $ac_func" >&5 >-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 >-if eval "test \"\${$as_ac_var+set}\" = set"; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-/* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char $ac_func (); below. */ >-#include <assert.h> >-/* Override any gcc2 internal prototype to avoid an error. */ >-#ifdef __cplusplus >-extern "C" >-#endif >-/* We use char because int might match the return type of a gcc2 >- builtin and then its argument prototype would still apply. */ >-char $ac_func (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ >-/* The GNU C library defines this for functions which it implements >- to always fail with ENOSYS. Some functions are actually named >- something starting with __ and the normal name is an alias. */ >-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) >-choke me >-#else >-f = $ac_func; >-#endif >- >- ; >- return 0; >-} >-_ACEOF >-rm -f conftest.$ac_objext conftest$ac_exeext >-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 >- (eval $ac_link) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest$ac_exeext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- eval "$as_ac_var=yes" >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-eval "$as_ac_var=no" >-fi >-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >-fi >-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 >-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 >-if test `eval echo '${'$as_ac_var'}'` = yes; then >- >-cat >>confdefs.h <<_ACEOF >-#define CRAY_STACKSEG_END $ac_func >-_ACEOF >- >- break >-fi >- >- done >-fi >- >-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 >-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 >-if test "${ac_cv_c_stack_direction+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- if test "$cross_compiling" = yes; then >- ac_cv_c_stack_direction=0 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-int >-find_stack_direction () >-{ >- static char *addr = 0; >- auto char dummy; >- if (addr == 0) >- { >- addr = &dummy; >- return find_stack_direction (); >- } >- else >- return (&dummy > addr) ? 1 : -1; >-} >- >-int >-main () >-{ >- exit (find_stack_direction () < 0); >-} >-_ACEOF >-rm -f conftest$ac_exeext >-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 >- (eval $ac_link) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_cv_c_stack_direction=1 >-else >- echo "$as_me: program exited with status $ac_status" >&5 >-echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-( exit $ac_status ) >-ac_cv_c_stack_direction=-1 >-fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >-fi >-fi >-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 >-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 >- >-cat >>confdefs.h <<_ACEOF >-#define STACK_DIRECTION $ac_cv_c_stack_direction >-_ACEOF >- >- >-fi >- >- >- >-for ac_header in stdlib.h unistd.h >-do >-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` >-if eval "test \"\${$as_ac_Header+set}\" = set"; then >- echo "$as_me:$LINENO: checking for $ac_header" >&5 >-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >-if eval "test \"\${$as_ac_Header+set}\" = set"; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-fi >-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 >-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 >-else >- # Is the header compilable? >-echo "$as_me:$LINENO: checking $ac_header usability" >&5 >-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 >-cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-$ac_includes_default >-#include <$ac_header> >-_ACEOF >-rm -f conftest.$ac_objext >-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >- (eval $ac_compile) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest.$ac_objext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_header_compiler=yes >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-ac_header_compiler=no >-fi >-rm -f conftest.$ac_objext conftest.$ac_ext >-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 >-echo "${ECHO_T}$ac_header_compiler" >&6 >- >-# Is the header present? >-echo "$as_me:$LINENO: checking $ac_header presence" >&5 >-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 >-cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-#include <$ac_header> >-_ACEOF >-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 >- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 >- ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >- rm -f conftest.er1 >- cat conftest.err >&5 >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } >/dev/null; then >- if test -s conftest.err; then >- ac_cpp_err=$ac_c_preproc_warn_flag >- else >- ac_cpp_err= >- fi >-else >- ac_cpp_err=yes >-fi >-if test -z "$ac_cpp_err"; then >- ac_header_preproc=yes >-else >- echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >- ac_header_preproc=no >-fi >-rm -f conftest.err conftest.$ac_ext >-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 >-echo "${ECHO_T}$ac_header_preproc" >&6 >- >-# So? What about this header? >-case $ac_header_compiler:$ac_header_preproc in >- yes:no ) >- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 >-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} >- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >- no:yes ) >- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 >-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} >- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 >-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} >- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >-esac >-echo "$as_me:$LINENO: checking for $ac_header" >&5 >-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >-if eval "test \"\${$as_ac_Header+set}\" = set"; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- eval "$as_ac_Header=$ac_header_preproc" >-fi >-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 >-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 >- >-fi >-if test `eval echo '${'$as_ac_Header'}'` = yes; then >- cat >>confdefs.h <<_ACEOF >-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 >-_ACEOF >- >-fi >- >-done >- >- >-for ac_func in getpagesize >-do >-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` >-echo "$as_me:$LINENO: checking for $ac_func" >&5 >-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 >-if eval "test \"\${$as_ac_var+set}\" = set"; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-/* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char $ac_func (); below. */ >-#include <assert.h> >-/* Override any gcc2 internal prototype to avoid an error. */ >-#ifdef __cplusplus >-extern "C" >-#endif >-/* We use char because int might match the return type of a gcc2 >- builtin and then its argument prototype would still apply. */ >-char $ac_func (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ >-/* The GNU C library defines this for functions which it implements >- to always fail with ENOSYS. Some functions are actually named >- something starting with __ and the normal name is an alias. */ >-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) >-choke me >-#else >-f = $ac_func; >-#endif >- >- ; >- return 0; >-} >-_ACEOF >-rm -f conftest.$ac_objext conftest$ac_exeext >-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 >- (eval $ac_link) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest$ac_exeext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- eval "$as_ac_var=yes" >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-eval "$as_ac_var=no" >-fi >-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >-fi >-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 >-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 >-if test `eval echo '${'$as_ac_var'}'` = yes; then >- cat >>confdefs.h <<_ACEOF >-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 >-_ACEOF >- >-fi >-done >- >-echo "$as_me:$LINENO: checking for working mmap" >&5 >-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 >-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- if test "$cross_compiling" = yes; then >- ac_cv_func_mmap_fixed_mapped=no >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-$ac_includes_default >-/* malloc might have been renamed as rpl_malloc. */ >-#undef malloc >- >-/* Thanks to Mike Haertel and Jim Avera for this test. >- Here is a matrix of mmap possibilities: >- mmap private not fixed >- mmap private fixed at somewhere currently unmapped >- mmap private fixed at somewhere already mapped >- mmap shared not fixed >- mmap shared fixed at somewhere currently unmapped >- mmap shared fixed at somewhere already mapped >- For private mappings, we should verify that changes cannot be read() >- back from the file, nor mmap's back from the file at a different >- address. (There have been systems where private was not correctly >- implemented like the infamous i386 svr4.0, and systems where the >- VM page cache was not coherent with the file system buffer cache >- like early versions of FreeBSD and possibly contemporary NetBSD.) >- For shared mappings, we should conversely verify that changes get >- propagated back to all the places they're supposed to be. >- >- Grep wants private fixed already mapped. >- The main things grep needs to know about mmap are: >- * does it exist and is it safe to write into the mmap'd area >- * how to use it (BSD variants) */ >- >-#include <fcntl.h> >-#include <sys/mman.h> >- >-#if !STDC_HEADERS && !HAVE_STDLIB_H >-char *malloc (); >-#endif >- >-/* This mess was copied from the GNU getpagesize.h. */ >-#if !HAVE_GETPAGESIZE >-/* Assume that all systems that can run configure have sys/param.h. */ >-# if !HAVE_SYS_PARAM_H >-# define HAVE_SYS_PARAM_H 1 >-# endif >- >-# ifdef _SC_PAGESIZE >-# define getpagesize() sysconf(_SC_PAGESIZE) >-# else /* no _SC_PAGESIZE */ >-# if HAVE_SYS_PARAM_H >-# include <sys/param.h> >-# ifdef EXEC_PAGESIZE >-# define getpagesize() EXEC_PAGESIZE >-# else /* no EXEC_PAGESIZE */ >-# ifdef NBPG >-# define getpagesize() NBPG * CLSIZE >-# ifndef CLSIZE >-# define CLSIZE 1 >-# endif /* no CLSIZE */ >-# else /* no NBPG */ >-# ifdef NBPC >-# define getpagesize() NBPC >-# else /* no NBPC */ >-# ifdef PAGESIZE >-# define getpagesize() PAGESIZE >-# endif /* PAGESIZE */ >-# endif /* no NBPC */ >-# endif /* no NBPG */ >-# endif /* no EXEC_PAGESIZE */ >-# else /* no HAVE_SYS_PARAM_H */ >-# define getpagesize() 8192 /* punt totally */ >-# endif /* no HAVE_SYS_PARAM_H */ >-# endif /* no _SC_PAGESIZE */ >- >-#endif /* no HAVE_GETPAGESIZE */ >- >-int >-main () >-{ >- char *data, *data2, *data3; >- int i, pagesize; >- int fd; >- >- pagesize = getpagesize (); >- >- /* First, make a file with some known garbage in it. */ >- data = (char *) malloc (pagesize); >- if (!data) >- exit (1); >- for (i = 0; i < pagesize; ++i) >- *(data + i) = rand (); >- umask (0); >- fd = creat ("conftest.mmap", 0600); >- if (fd < 0) >- exit (1); >- if (write (fd, data, pagesize) != pagesize) >- exit (1); >- close (fd); >- >- /* Next, try to mmap the file at a fixed address which already has >- something else allocated at it. If we can, also make sure that >- we see the same garbage. */ >- fd = open ("conftest.mmap", O_RDWR); >- if (fd < 0) >- exit (1); >- data2 = (char *) malloc (2 * pagesize); >- if (!data2) >- exit (1); >- data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); >- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, >- MAP_PRIVATE | MAP_FIXED, fd, 0L)) >- exit (1); >- for (i = 0; i < pagesize; ++i) >- if (*(data + i) != *(data2 + i)) >- exit (1); >- >- /* Finally, make sure that changes to the mapped area do not >- percolate back to the file as seen by read(). (This is a bug on >- some variants of i386 svr4.0.) */ >- for (i = 0; i < pagesize; ++i) >- *(data2 + i) = *(data2 + i) + 1; >- data3 = (char *) malloc (pagesize); >- if (!data3) >- exit (1); >- if (read (fd, data3, pagesize) != pagesize) >- exit (1); >- for (i = 0; i < pagesize; ++i) >- if (*(data + i) != *(data3 + i)) >- exit (1); >- close (fd); >- exit (0); >-} >-_ACEOF >-rm -f conftest$ac_exeext >-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 >- (eval $ac_link) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_cv_func_mmap_fixed_mapped=yes >-else >- echo "$as_me: program exited with status $ac_status" >&5 >-echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-( exit $ac_status ) >-ac_cv_func_mmap_fixed_mapped=no >-fi >-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext >+eval "$as_ac_Header=no" > fi >+rm -f conftest.$ac_objext conftest.$ac_ext > fi >-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 >-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 >-if test $ac_cv_func_mmap_fixed_mapped = yes; then >- >-cat >>confdefs.h <<\_ACEOF >-#define HAVE_MMAP 1 >+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 >+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 >+if test `eval echo '${'$as_ac_Header'}'` = yes; then >+ cat >>confdefs.h <<_ACEOF >+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 > _ACEOF > > fi >-rm -f conftest.mmap >- >- >- >- >- > >+done > > > > >-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h string.h \ >-unistd.h sys/param.h >+for ac_header in locale.h > do > as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` > if eval "test \"\${$as_ac_Header+set}\" = set"; then >@@ -5056,7 +4369,11 @@ > echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <$ac_header> > _ACEOF >@@ -5075,7 +4392,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -5087,13 +4405,17 @@ > echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <$ac_header> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -5110,7 +4432,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -5123,14 +4446,32 @@ > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 > echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for $ac_header" >&5 > echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >@@ -5152,95 +4493,7 @@ > > done > >- >- >- >- >- >- >- >- >- >- >- >-for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \ >-strdup __argz_count __argz_stringify __argz_next >-do >-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` >-echo "$as_me:$LINENO: checking for $ac_func" >&5 >-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 >-if eval "test \"\${$as_ac_var+set}\" = set"; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-/* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char $ac_func (); below. */ >-#include <assert.h> >-/* Override any gcc2 internal prototype to avoid an error. */ >-#ifdef __cplusplus >-extern "C" >-#endif >-/* We use char because int might match the return type of a gcc2 >- builtin and then its argument prototype would still apply. */ >-char $ac_func (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ >-/* The GNU C library defines this for functions which it implements >- to always fail with ENOSYS. Some functions are actually named >- something starting with __ and the normal name is an alias. */ >-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) >-choke me >-#else >-f = $ac_func; >-#endif >- >- ; >- return 0; >-} >-_ACEOF >-rm -f conftest.$ac_objext conftest$ac_exeext >-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 >- (eval $ac_link) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest$ac_exeext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- eval "$as_ac_var=yes" >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-eval "$as_ac_var=no" >-fi >-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >-fi >-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 >-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 >-if test `eval echo '${'$as_ac_var'}'` = yes; then >- cat >>confdefs.h <<_ACEOF >-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 >-_ACEOF >- >-fi >-done >- >- >- if test $ac_cv_header_locale_h = yes; then >+ if test $ac_cv_header_locale_h = yes; then > echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 > echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 > if test "${am_cv_val_LC_MESSAGES+set}" = set; then >@@ -5248,14 +4501,12 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <locale.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -5279,7 +4530,8 @@ > am_cv_val_LC_MESSAGES=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > am_cv_val_LC_MESSAGES=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -5297,16 +4549,13 @@ > USE_NLS=yes > > >- nls_cv_force_use_gnu_gettext="no" >+ gt_cv_have_gettext=no > >- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" >- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then >- nls_cv_header_intl= >- nls_cv_header_libgt= >- CATOBJEXT=NONE >- XGETTEXT=: >+ CATOBJEXT=NONE >+ XGETTEXT=: >+ INTLLIBS= > >- if test "${ac_cv_header_libintl_h+set}" = set; then >+ if test "${ac_cv_header_libintl_h+set}" = set; then > echo "$as_me:$LINENO: checking for libintl.h" >&5 > echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 > if test "${ac_cv_header_libintl_h+set}" = set; then >@@ -5320,7 +4569,11 @@ > echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <libintl.h> > _ACEOF >@@ -5339,7 +4592,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -5351,13 +4605,17 @@ > echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <libintl.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -5374,7 +4632,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -5387,14 +4646,32 @@ > { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 > echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for libintl.h" >&5 > echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 >@@ -5408,21 +4685,27 @@ > > fi > if test $ac_cv_header_libintl_h = yes; then >- echo "$as_me:$LINENO: checking for dgettext in libc" >&5 >+ gt_cv_func_dgettext_libintl="no" >+ libintl_extra_libs="" >+ >+ # >+ # First check in libc >+ # >+ echo "$as_me:$LINENO: checking for dgettext in libc" >&5 > echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6 > if test "${gt_cv_func_dgettext_libc+set}" = set; then > echo $ECHO_N "(cached) $ECHO_C" >&6 > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+ > #include <libintl.h> >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >+ > int > main () > { >@@ -5446,19 +4729,110 @@ > gt_cv_func_dgettext_libc=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > gt_cv_func_dgettext_libc=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >+ > fi > echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 > echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6 > >- gt_cv_func_dgettext_libintl="no" >- libintl_extra_libs="" >+ if test "$gt_cv_func_dgettext_libc" = "yes" ; then >+ >+for ac_func in bind_textdomain_codeset >+do >+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` >+echo "$as_me:$LINENO: checking for $ac_func" >&5 >+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 >+if eval "test \"\${$as_ac_var+set}\" = set"; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ cat >conftest.$ac_ext <<_ACEOF >+#line $LINENO "configure" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+/* System header to define __stub macros and hopefully few prototypes, >+ which can conflict with char $ac_func (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif >+/* Override any gcc2 internal prototype to avoid an error. */ >+#ifdef __cplusplus >+extern "C" >+{ >+#endif >+/* We use char because int might match the return type of a gcc2 >+ builtin and then its argument prototype would still apply. */ >+char $ac_func (); >+/* The GNU C library defines this for functions which it implements >+ to always fail with ENOSYS. Some functions are actually named >+ something starting with __ and the normal name is an alias. */ >+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) >+choke me >+#else >+char (*f) () = $ac_func; >+#endif >+#ifdef __cplusplus >+} >+#endif >+ >+int >+main () >+{ >+return f != $ac_func; >+ ; >+ return 0; >+} >+_ACEOF >+rm -f conftest.$ac_objext conftest$ac_exeext >+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 >+ (eval $ac_link) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); } && >+ { ac_try='test -s conftest$ac_exeext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then >+ eval "$as_ac_var=yes" >+else >+ echo "$as_me: failed program was:" >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+eval "$as_ac_var=no" >+fi >+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >+fi >+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 >+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 >+if test `eval echo '${'$as_ac_var'}'` = yes; then >+ cat >>confdefs.h <<_ACEOF >+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 >+_ACEOF >+ >+fi >+done >+ >+ fi >+ >+ # >+ # If we don't have everything we want, check in libintl >+ # >+ if test "$gt_cv_func_dgettext_libc" != "yes" \ >+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then > >- if test "$gt_cv_func_dgettext_libc" != "yes" ; then >- echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 >+ echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 > echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6 > if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then > echo $ECHO_N "(cached) $ECHO_C" >&6 >@@ -5467,7 +4841,11 @@ > LIBS="-lintl $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -5476,12 +4854,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char bindtextdomain (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -5505,7 +4877,8 @@ > ac_cv_lib_intl_bindtextdomain=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_intl_bindtextdomain=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -5523,7 +4896,11 @@ > LIBS="-lintl $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus >@@ -5532,12 +4909,6 @@ > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char dgettext (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { >@@ -5561,7 +4932,8 @@ > ac_cv_lib_intl_dgettext=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_cv_lib_intl_dgettext=no > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -5576,12 +4948,12 @@ > fi > > >- if test "$gt_cv_func_dgettext_libc" != "yes" ; then >- echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 >+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then >+ echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 > echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6 >- echo "$as_me:$LINENO: result: " >&5 >+ echo "$as_me:$LINENO: result: " >&5 > echo "${ECHO_T}" >&6 >- echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 >+ echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 > echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6 > if test "${ac_cv_lib_intl_dcgettext+set}" = set; then > echo $ECHO_N "(cached) $ECHO_C" >&6 >@@ -5590,25 +4962,118 @@ > LIBS="-lintl -liconv $LIBS" > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+ >+/* Override any gcc2 internal prototype to avoid an error. */ >+#ifdef __cplusplus >+extern "C" >+#endif >+/* We use char because int might match the return type of a gcc2 >+ builtin and then its argument prototype would still apply. */ >+char dcgettext (); >+int >+main () >+{ >+dcgettext (); >+ ; >+ return 0; >+} >+_ACEOF >+rm -f conftest.$ac_objext conftest$ac_exeext >+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 >+ (eval $ac_link) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); } && >+ { ac_try='test -s conftest$ac_exeext' >+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >+ (eval $ac_try) 2>&5 >+ ac_status=$? >+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ (exit $ac_status); }; }; then >+ ac_cv_lib_intl_dcgettext=yes >+else >+ echo "$as_me: failed program was:" >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+ac_cv_lib_intl_dcgettext=no >+fi >+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >+LIBS=$ac_check_lib_save_LIBS >+fi >+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 >+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6 >+if test $ac_cv_lib_intl_dcgettext = yes; then >+ gt_cv_func_dgettext_libintl=yes >+ libintl_extra_libs=-liconv >+else >+ : >+fi >+ >+ fi >+ >+ # >+ # If we found libintl, then check in it for bind_textdomain_codeset(); >+ # we'll prefer libc if neither have bind_textdomain_codeset(), >+ # and both have dgettext >+ # >+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then >+ glib_save_LIBS="$LIBS" >+ LIBS="$LIBS -lintl $libintl_extra_libs" >+ unset ac_cv_func_bind_textdomain_codeset > >+for ac_func in bind_textdomain_codeset >+do >+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` >+echo "$as_me:$LINENO: checking for $ac_func" >&5 >+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 >+if eval "test \"\${$as_ac_var+set}\" = set"; then >+ echo $ECHO_N "(cached) $ECHO_C" >&6 >+else >+ cat >conftest.$ac_ext <<_ACEOF >+#line $LINENO "configure" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ >+/* System header to define __stub macros and hopefully few prototypes, >+ which can conflict with char $ac_func (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ >-char dcgettext (); >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >+char $ac_func (); >+/* The GNU C library defines this for functions which it implements >+ to always fail with ENOSYS. Some functions are actually named >+ something starting with __ and the normal name is an alias. */ >+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) >+choke me >+#else >+char (*f) () = $ac_func; > #endif >+#ifdef __cplusplus >+} >+#endif >+ > int > main () > { >-dcgettext (); >+return f != $ac_func; > ; > return 0; > } >@@ -5625,39 +5090,53 @@ > ac_status=$? > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); }; }; then >- ac_cv_lib_intl_dcgettext=yes >+ eval "$as_ac_var=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-ac_cv_lib_intl_dcgettext=no >+sed 's/^/| /' conftest.$ac_ext >&5 >+ >+eval "$as_ac_var=no" > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >-LIBS=$ac_check_lib_save_LIBS > fi >-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 >-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6 >-if test $ac_cv_lib_intl_dcgettext = yes; then >- gt_cv_func_dgettext_libintl=yes >- libintl_extra_libs=-liconv >-else >- : >+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 >+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 >+if test `eval echo '${'$as_ac_var'}'` = yes; then >+ cat >>confdefs.h <<_ACEOF >+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 >+_ACEOF >+ > fi >+done >+ >+ LIBS="$glib_save_LIBS" > >+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then >+ gt_cv_func_dgettext_libc=no >+ else >+ if test "$gt_cv_func_dgettext_libc" = "yes"; then >+ gt_cv_func_dgettext_libintl=no > fi > fi >+ fi >+ fi > >- if test "$gt_cv_func_dgettext_libintl" = "yes"; then >- LIBS="$LIBS -lintl $libintl_extra_libs"; >- fi >+ if test "$gt_cv_func_dgettext_libc" = "yes" \ >+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then >+ gt_cv_have_gettext=yes >+ fi >+ >+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then >+ INTLLIBS="-lintl $libintl_extra_libs" >+ fi > >- if test "$gt_cv_func_dgettext_libc" = "yes" \ >- || test "$gt_cv_func_dgettext_libintl" = "yes"; then >+ if test "$gt_cv_have_gettext" = "yes"; then > > cat >>confdefs.h <<\_ACEOF > #define HAVE_GETTEXT 1 > _ACEOF > >- # Extract the first word of "msgfmt", so it can be a program name with args. >+ # Extract the first word of "msgfmt", so it can be a program name with args. > set dummy msgfmt; ac_word=$2 > echo "$as_me:$LINENO: checking for $ac_word" >&5 > echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 >@@ -5692,7 +5171,7 @@ > echo "$as_me:$LINENO: result: no" >&5 > echo "${ECHO_T}no" >&6 > fi >- if test "$MSGFMT" != "no"; then >+ if test "$MSGFMT" != "no"; then > > for ac_func in dcgettext > do >@@ -5704,37 +5183,44 @@ > else > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > /* System header to define __stub macros and hopefully few prototypes, >- which can conflict with char $ac_func (); below. */ >-#include <assert.h> >+ which can conflict with char $ac_func (); below. >+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since >+ <limits.h> exists even on freestanding compilers. */ >+#ifdef __STDC__ >+# include <limits.h> >+#else >+# include <assert.h> >+#endif > /* Override any gcc2 internal prototype to avoid an error. */ > #ifdef __cplusplus > extern "C" >+{ > #endif > /* We use char because int might match the return type of a gcc2 > builtin and then its argument prototype would still apply. */ > char $ac_func (); >-char (*f) (); >- >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif >-int >-main () >-{ > /* The GNU C library defines this for functions which it implements > to always fail with ENOSYS. Some functions are actually named > something starting with __ and the normal name is an alias. */ > #if defined (__stub_$ac_func) || defined (__stub___$ac_func) > choke me > #else >-f = $ac_func; >+char (*f) () = $ac_func; >+#endif >+#ifdef __cplusplus >+} > #endif > >+int >+main () >+{ >+return f != $ac_func; > ; > return 0; > } >@@ -5754,7 +5240,8 @@ > eval "$as_ac_var=yes" > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > eval "$as_ac_var=no" > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >@@ -5769,7 +5256,7 @@ > fi > done > >- # Extract the first word of "gmsgfmt", so it can be a program name with args. >+ # Extract the first word of "gmsgfmt", so it can be a program name with args. > set dummy gmsgfmt; ac_word=$2 > echo "$as_me:$LINENO: checking for $ac_word" >&5 > echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 >@@ -5809,7 +5296,7 @@ > echo "${ECHO_T}no" >&6 > fi > >- # Extract the first word of "xgettext", so it can be a program name with args. >+ # Extract the first word of "xgettext", so it can be a program name with args. > set dummy xgettext; ac_word=$2 > echo "$as_me:$LINENO: checking for $ac_word" >&5 > echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 >@@ -5845,21 +5332,19 @@ > echo "${ECHO_T}no" >&6 > fi > >- cat >conftest.$ac_ext <<_ACEOF >+ cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > >-#ifdef F77_DUMMY_MAIN >-# ifdef __cplusplus >- extern "C" >-# endif >- int F77_DUMMY_MAIN() { return 1; } >-#endif > int > main () > { > extern int _nl_msg_cat_cntr; >- return _nl_msg_cat_cntr >+ return _nl_msg_cat_cntr > ; > return 0; > } >@@ -5877,42 +5362,31 @@ > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); }; }; then > CATOBJEXT=.gmo >- DATADIRNAME=share >+ DATADIRNAME=share > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > CATOBJEXT=.mo >- DATADIRNAME=lib >+ DATADIRNAME=lib > fi > rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext >- INSTOBJEXT=.mo >- fi >- fi >- >- # Added by Martin Baulig 12/15/98 for libc5 systems >- if test "$gt_cv_func_dgettext_libc" != "yes" \ >- && test "$gt_cv_func_dgettext_libintl" = "yes"; then >- INTLLIBS="-lintl $libintl_extra_libs" >- LIBS=`echo $LIBS | sed -e 's/-lintl//'` >- fi >+ INSTOBJEXT=.mo >+ else >+ gt_cv_have_gettext=no >+ fi >+ fi > > fi > > > >- if test "$CATOBJEXT" = "NONE"; then >- nls_cv_use_gnu_gettext=yes >- fi >- fi >- >- if test "$nls_cv_use_gnu_gettext" != "yes"; then >+ if test "$gt_cv_have_gettext" = "yes" ; then > > cat >>confdefs.h <<\_ACEOF > #define ENABLE_NLS 1 > _ACEOF > >- else >- CATOBJEXT= > fi > > if test "$XGETTEXT" != ":"; then >@@ -5928,7 +5402,7 @@ > # We need to process the po/ directory. > POSUB=po > >- ac_config_commands="$ac_config_commands default-2" >+ ac_config_commands="$ac_config_commands default-2" > > > for lang in $ALL_LINGUAS; do >@@ -5948,7 +5422,7 @@ > > > >- if test "x$CATOBJEXT" != "x"; then >+ if test "$gt_cv_have_gettext" = "yes"; then > if test "x$ALL_LINGUAS" = "x"; then > LINGUAS= > else >@@ -5970,120 +5444,6 @@ > fi > fi > >- test -d po || mkdir po >- if test "$CATOBJEXT" = ".cat"; then >- if test "${ac_cv_header_linux_version_h+set}" = set; then >- echo "$as_me:$LINENO: checking for linux/version.h" >&5 >-echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6 >-if test "${ac_cv_header_linux_version_h+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-fi >-echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5 >-echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6 >-else >- # Is the header compilable? >-echo "$as_me:$LINENO: checking linux/version.h usability" >&5 >-echo $ECHO_N "checking linux/version.h usability... $ECHO_C" >&6 >-cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-$ac_includes_default >-#include <linux/version.h> >-_ACEOF >-rm -f conftest.$ac_objext >-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >- (eval $ac_compile) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -s conftest.$ac_objext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_header_compiler=yes >-else >- echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >-ac_header_compiler=no >-fi >-rm -f conftest.$ac_objext conftest.$ac_ext >-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 >-echo "${ECHO_T}$ac_header_compiler" >&6 >- >-# Is the header present? >-echo "$as_me:$LINENO: checking linux/version.h presence" >&5 >-echo $ECHO_N "checking linux/version.h presence... $ECHO_C" >&6 >-cat >conftest.$ac_ext <<_ACEOF >-#line $LINENO "configure" >-#include "confdefs.h" >-#include <linux/version.h> >-_ACEOF >-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 >- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 >- ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >- rm -f conftest.er1 >- cat conftest.err >&5 >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } >/dev/null; then >- if test -s conftest.err; then >- ac_cpp_err=$ac_c_preproc_warn_flag >- else >- ac_cpp_err= >- fi >-else >- ac_cpp_err=yes >-fi >-if test -z "$ac_cpp_err"; then >- ac_header_preproc=yes >-else >- echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >- ac_header_preproc=no >-fi >-rm -f conftest.err conftest.$ac_ext >-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 >-echo "${ECHO_T}$ac_header_preproc" >&6 >- >-# So? What about this header? >-case $ac_header_compiler:$ac_header_preproc in >- yes:no ) >- { echo "$as_me:$LINENO: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&5 >-echo "$as_me: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;} >- { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;};; >- no:yes ) >- { echo "$as_me:$LINENO: WARNING: linux/version.h: present but cannot be compiled" >&5 >-echo "$as_me: WARNING: linux/version.h: present but cannot be compiled" >&2;} >- { echo "$as_me:$LINENO: WARNING: linux/version.h: check for missing prerequisite headers?" >&5 >-echo "$as_me: WARNING: linux/version.h: check for missing prerequisite headers?" >&2;} >- { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;};; >-esac >-echo "$as_me:$LINENO: checking for linux/version.h" >&5 >-echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6 >-if test "${ac_cv_header_linux_version_h+set}" = set; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- ac_cv_header_linux_version_h=$ac_header_preproc >-fi >-echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5 >-echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6 >- >-fi >-if test $ac_cv_header_linux_version_h = yes; then >- msgformat=linux >-else >- msgformat=xopen >-fi >- >- >- >- sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed >- fi >- > MKINSTALLDIRS= > if test -n "$ac_aux_dir"; then > MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" >@@ -6179,7 +5539,11 @@ > echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <popt.h> > _ACEOF >@@ -6198,7 +5562,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -6210,13 +5575,17 @@ > echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <popt.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -6233,7 +5602,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -6246,14 +5616,32 @@ > { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 > echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for popt.h" >&5 > echo $ECHO_N "checking for popt.h... $ECHO_C" >&6 >@@ -6455,7 +5843,8 @@ > fi; > > if test "x$with_xft" != "xno"; then >- if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then >+ CPPFLAGS="$CPPFLAGS -I /usr/include/freetype2" >+ if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then > echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 > echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6 > if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then >@@ -6469,7 +5858,11 @@ > echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > $ac_includes_default > #include <X11/Xft/Xft.h> > _ACEOF >@@ -6488,7 +5881,8 @@ > ac_header_compiler=yes > else > echo "$as_me: failed program was:" >&5 >-cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_compiler=no > fi > rm -f conftest.$ac_objext conftest.$ac_ext >@@ -6500,13 +5894,17 @@ > echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6 > cat >conftest.$ac_ext <<_ACEOF > #line $LINENO "configure" >-#include "confdefs.h" >+/* confdefs.h. */ >+_ACEOF >+cat confdefs.h >>conftest.$ac_ext >+cat >>conftest.$ac_ext <<_ACEOF >+/* end confdefs.h. */ > #include <X11/Xft/Xft.h> > _ACEOF > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 > (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 > ac_status=$? >- egrep -v '^ *\+' conftest.er1 >conftest.err >+ grep -v '^ *+' conftest.er1 >conftest.err > rm -f conftest.er1 > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 >@@ -6523,7 +5921,8 @@ > ac_header_preproc=yes > else > echo "$as_me: failed program was:" >&5 >- cat conftest.$ac_ext >&5 >+sed 's/^/| /' conftest.$ac_ext >&5 >+ > ac_header_preproc=no > fi > rm -f conftest.err conftest.$ac_ext >@@ -6536,14 +5935,32 @@ > { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;} > { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > no:yes ) > { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5 > echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;} > { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&5 > echo "$as_me: WARNING: X11/Xft/Xft.h: check for missing prerequisite headers?" >&2;} > { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;};; >+echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;} >+ ( >+ cat <<\_ASBOX >+## ------------------------------------ ## >+## Report this to bug-autoconf@gnu.org. ## >+## ------------------------------------ ## >+_ASBOX >+ ) | >+ sed "s/^/$as_me: WARNING: /" >&2 >+ ;; > esac > echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 > echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6 >@@ -6917,7 +6334,7 @@ > fi > > >-ac_config_files="$ac_config_files Makefile src/Makefile src/libnr/Makefile src/libnrtype/Makefile src/xml/Makefile src/svg/Makefile src/widgets/Makefile src/helper/Makefile src/dialogs/Makefile src/display/Makefile po/Makefile.in glade/Makefile sodipodi.spec sodipodi.1" >+ ac_config_files="$ac_config_files Makefile src/Makefile src/libnr/Makefile src/libnrtype/Makefile src/xml/Makefile src/svg/Makefile src/widgets/Makefile src/helper/Makefile src/dialogs/Makefile src/display/Makefile po/Makefile.in glade/Makefile sodipodi.spec sodipodi.1" > cat >confcache <<\_ACEOF > # This file is a shell script that caches the results of configure > # tests run on this system so they can be shared between configure >@@ -6928,7 +6345,7 @@ > # config.status only pays attention to the cache file if you give it > # the --recheck option to rerun configure. > # >-# `ac_cv_env_foo' variables (set or unset) will be overriden when >+# `ac_cv_env_foo' variables (set or unset) will be overridden when > # loading this file, other *unset* `ac_cv_foo' will be assigned the > # following values. > >@@ -6963,7 +6380,7 @@ > t end > /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ > : end' >>confcache >-if cmp -s $cache_file confcache; then :; else >+if diff $cache_file confcache >/dev/null 2>&1; then :; else > if test -w $cache_file; then > test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" > cat confcache >$cache_file >@@ -6994,6 +6411,21 @@ > > DEFS=-DHAVE_CONFIG_H > >+ac_libobjs= >+ac_ltlibobjs= >+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue >+ # 1. Remove the extension, and $U if already installed. >+ ac_i=`echo "$ac_i" | >+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'` >+ # 2. Add them. >+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" >+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' >+done >+LIBOBJS=$ac_libobjs >+ >+LTLIBOBJS=$ac_ltlibobjs >+ >+ > > > mv -f po/POTFILES po/POTFILES.tmp >@@ -7057,11 +6489,12 @@ > # configure, is in config.log if it exists. > > debug=false >+ac_cs_recheck=false >+ac_cs_silent=false > SHELL=\${CONFIG_SHELL-$SHELL} > _ACEOF > > cat >>$CONFIG_STATUS <<\_ACEOF >- > ## --------------------- ## > ## M4sh Initialization. ## > ## --------------------- ## >@@ -7070,11 +6503,13 @@ > if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then > emulate sh > NULLCMD=: >+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which >+ # is contrary to our usage. Disable this feature. >+ alias -g '${1+"$@"}'='"$@"' > elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then > set -o posix > fi > >-# NLS nuisances. > # Support unset when possible. > if (FOO=FOO; unset FOO) >/dev/null 2>&1; then > as_unset=unset >@@ -7082,34 +6517,42 @@ > as_unset=false > fi > >-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && >- { $as_unset LANG || test "${LANG+set}" != set; } || >- { LANG=C; export LANG; } >-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && >- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || >- { LC_ALL=C; export LC_ALL; } >-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && >- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || >- { LC_TIME=C; export LC_TIME; } >-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && >- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || >- { LC_CTYPE=C; export LC_CTYPE; } >-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && >- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || >- { LANGUAGE=C; export LANGUAGE; } >-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && >- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || >- { LC_COLLATE=C; export LC_COLLATE; } >-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && >- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || >- { LC_NUMERIC=C; export LC_NUMERIC; } >-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && >- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || >- { LC_MESSAGES=C; export LC_MESSAGES; } >+ >+# Work around bugs in pre-3.0 UWIN ksh. >+$as_unset ENV MAIL MAILPATH >+PS1='$ ' >+PS2='> ' >+PS4='+ ' >+ >+# NLS nuisances. >+for as_var in \ >+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ >+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ >+ LC_TELEPHONE LC_TIME >+do >+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then >+ eval $as_var=C; export $as_var >+ else >+ $as_unset $as_var >+ fi >+done >+ >+# Required to use basename. >+if expr a : '\(a\)' >/dev/null 2>&1; then >+ as_expr=expr >+else >+ as_expr=false >+fi >+ >+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then >+ as_basename=basename >+else >+ as_basename=false >+fi > > > # Name of the executable. >-as_me=`(basename "$0") 2>/dev/null || >+as_me=`$as_basename "$0" || > $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ > X"$0" : 'X\(//\)$' \| \ > X"$0" : 'X\(/\)$' \| \ >@@ -7120,6 +6563,7 @@ > /^X\/\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` > >+ > # PATH needs CR, and LINENO needs CR and PATH. > # Avoid depending upon Character Ranges. > as_cr_letters='abcdefghijklmnopqrstuvwxyz' >@@ -7130,15 +6574,15 @@ > > # The user is always right. > if test "${PATH_SEPARATOR+set}" != set; then >- echo "#! /bin/sh" >conftest.sh >- echo "exit 0" >>conftest.sh >- chmod +x conftest.sh >- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then >+ echo "#! /bin/sh" >conf$$.sh >+ echo "exit 0" >>conf$$.sh >+ chmod +x conf$$.sh >+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then > PATH_SEPARATOR=';' > else > PATH_SEPARATOR=: > fi >- rm -f conftest.sh >+ rm -f conf$$.sh > fi > > >@@ -7187,6 +6631,8 @@ > as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` > test "x$as_lineno_1" != "x$as_lineno_2" && > test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then >+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } >+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } > CONFIG_SHELL=$as_dir/$as_base > export CONFIG_SHELL > exec "$CONFIG_SHELL" "$0" ${1+"$@"} >@@ -7260,6 +6706,12 @@ > fi > rm -f conf$$ conf$$.exe conf$$.file > >+if mkdir -p . 2>/dev/null; then >+ as_mkdir_p=: >+else >+ as_mkdir_p=false >+fi >+ > as_executable_p="test -f" > > # Sed expression to map a string onto a valid CPP name. >@@ -7276,7 +6728,7 @@ > IFS=" $as_nl" > > # CDPATH. >-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } >+$as_unset CDPATH > > exec 6>&1 > >@@ -7293,7 +6745,7 @@ > cat >&5 <<_CSEOF > > This file was extended by sodipodi $as_me 0.31, which was >-generated by GNU Autoconf 2.53. Invocation command line was >+generated by GNU Autoconf 2.57. Invocation command line was > > CONFIG_FILES = $CONFIG_FILES > CONFIG_HEADERS = $CONFIG_HEADERS >@@ -7333,6 +6785,7 @@ > > -h, --help print this help, then exit > -V, --version print version number, then exit >+ -q, --quiet do not print progress messages > -d, --debug don't remove temporary files > --recheck update $as_me by reconfiguring in the same conditions > --file=FILE[:TEMPLATE] >@@ -7355,7 +6808,7 @@ > cat >>$CONFIG_STATUS <<_ACEOF > ac_cs_version="\\ > sodipodi config.status 0.31 >-configured by $0, generated by GNU Autoconf 2.53, >+configured by $0, generated by GNU Autoconf 2.57, > with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" > > Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 >@@ -7376,25 +6829,25 @@ > --*=*) > ac_option=`expr "x$1" : 'x\([^=]*\)='` > ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` >- shift >- set dummy "$ac_option" "$ac_optarg" ${1+"$@"} >- shift >+ ac_shift=: >+ ;; >+ -*) >+ ac_option=$1 >+ ac_optarg=$2 >+ ac_shift=shift > ;; >- -*);; > *) # This is not an option, so the user has probably given explicit > # arguments. >+ ac_option=$1 > ac_need_defaults=false;; > esac > >- case $1 in >+ case $ac_option in > # Handling of the options. > _ACEOF >-cat >>$CONFIG_STATUS <<_ACEOF >- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) >- echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" >- exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; >-_ACEOF > cat >>$CONFIG_STATUS <<\_ACEOF >+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) >+ ac_cs_recheck=: ;; > --version | --vers* | -V ) > echo "$ac_cs_version"; exit 0 ;; > --he | --h) >@@ -7409,13 +6862,16 @@ > --debug | --d* | -d ) > debug=: ;; > --file | --fil | --fi | --f ) >- shift >- CONFIG_FILES="$CONFIG_FILES $1" >+ $ac_shift >+ CONFIG_FILES="$CONFIG_FILES $ac_optarg" > ac_need_defaults=false;; > --header | --heade | --head | --hea ) >- shift >- CONFIG_HEADERS="$CONFIG_HEADERS $1" >+ $ac_shift >+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" > ac_need_defaults=false;; >+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ >+ | -silent | --silent | --silen | --sile | --sil | --si | --s) >+ ac_cs_silent=: ;; > > # This is an error. > -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 >@@ -7430,6 +6886,20 @@ > shift > done > >+ac_configure_extra_args= >+ >+if $ac_cs_silent; then >+ exec 6>/dev/null >+ ac_configure_extra_args="$ac_configure_extra_args --silent" >+fi >+ >+_ACEOF >+cat >>$CONFIG_STATUS <<_ACEOF >+if \$ac_cs_recheck; then >+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 >+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion >+fi >+ > _ACEOF > > cat >>$CONFIG_STATUS <<_ACEOF >@@ -7484,6 +6954,9 @@ > test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands > fi > >+# Have a temporary directory for convenience. Make it in the build tree >+# simply because there is no reason to put it here, and in addition, >+# creating and moving files from /tmp can sometimes cause problems. > # Create a temporary directory, and hook for its removal unless debugging. > $debug || > { >@@ -7492,17 +6965,17 @@ > } > > # Create a (secure) tmp directory for tmp files. >-: ${TMPDIR=/tmp} >+ > { >- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && >+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && > test -n "$tmp" && test -d "$tmp" > } || > { >- tmp=$TMPDIR/cs$$-$RANDOM >+ tmp=./confstat$$-$RANDOM > (umask 077 && mkdir $tmp) > } || > { >- echo "$me: cannot create a temporary directory in $TMPDIR" >&2 >+ echo "$me: cannot create a temporary directory in ." >&2 > { (exit 1); exit 1; } > } > >@@ -7570,6 +7043,7 @@ > s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t > s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t > s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t >+s,@INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t > s,@INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t > s,@INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t > s,@INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t >@@ -7579,6 +7053,7 @@ > s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t > s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t > s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t >+s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t > s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t > s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t > s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t >@@ -7607,11 +7082,11 @@ > s,@CCDEPMODE@,$CCDEPMODE,;t t > s,@CCAS@,$CCAS,;t t > s,@CCASFLAGS@,$CCASFLAGS,;t t >-s,@CPP@,$CPP,;t t >-s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t > s,@RANLIB@,$RANLIB,;t t > s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t >-s,@ALLOCA@,$ALLOCA,;t t >+s,@CPP@,$CPP,;t t >+s,@EGREP@,$EGREP,;t t >+s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t > s,@USE_NLS@,$USE_NLS,;t t > s,@MSGFMT@,$MSGFMT,;t t > s,@GMSGFMT@,$GMSGFMT,;t t >@@ -7621,9 +7096,9 @@ > s,@DATADIRNAME@,$DATADIRNAME,;t t > s,@GMOFILES@,$GMOFILES,;t t > s,@INSTOBJEXT@,$INSTOBJEXT,;t t >-s,@INTLDEPS@,$INTLDEPS,;t t > s,@INTLLIBS@,$INTLLIBS,;t t >-s,@INTLOBJS@,$INTLOBJS,;t t >+s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t >+s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t > s,@POFILES@,$POFILES,;t t > s,@POSUB@,$POSUB,;t t > s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t >@@ -7644,6 +7119,8 @@ > s,@SODIPODI_LIBS@,$SODIPODI_LIBS,;t t > s,@USE_MMX_TRUE@,$USE_MMX_TRUE,;t t > s,@USE_MMX_FALSE@,$USE_MMX_FALSE,;t t >+s,@LIBOBJS@,$LIBOBJS,;t t >+s,@LTLIBOBJS@,$LTLIBOBJS,;t t > CEOF > > _ACEOF >@@ -7714,25 +7191,30 @@ > /^X\(\/\/\)$/{ s//\1/; q; } > /^X\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` >- { case "$ac_dir" in >- [\\/]* | ?:[\\/]* ) as_incr_dir=;; >- *) as_incr_dir=.;; >-esac >-as_dummy="$ac_dir" >-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do >- case $as_mkdir_dir in >- # Skip DOS drivespec >- ?:) as_incr_dir=$as_mkdir_dir ;; >- *) >- as_incr_dir=$as_incr_dir/$as_mkdir_dir >- test -d "$as_incr_dir" || >- mkdir "$as_incr_dir" || >- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 >-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} >- { (exit 1); exit 1; }; } >- ;; >- esac >-done; } >+ { if $as_mkdir_p; then >+ mkdir -p "$ac_dir" >+ else >+ as_dir="$ac_dir" >+ as_dirs= >+ while test ! -d "$as_dir"; do >+ as_dirs="$as_dir $as_dirs" >+ as_dir=`(dirname "$as_dir") 2>/dev/null || >+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >+ X"$as_dir" : 'X\(//\)[^/]' \| \ >+ X"$as_dir" : 'X\(//\)$' \| \ >+ X"$as_dir" : 'X\(/\)' \| \ >+ . : '\(.\)' 2>/dev/null || >+echo X"$as_dir" | >+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } >+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } >+ /^X\(\/\/\)$/{ s//\1/; q; } >+ /^X\(\/\).*/{ s//\1/; q; } >+ s/.*/./; q'` >+ done >+ test ! -n "$as_dirs" || mkdir $as_dirs >+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 >+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} >+ { (exit 1); exit 1; }; }; } > > ac_builddir=. > >@@ -7762,7 +7244,7 @@ > # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be > # absolute. > ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` >-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` >+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` > ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` > ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` > >@@ -7952,7 +7434,7 @@ > # Break up conftest.defines because some shells have a limit on the size > # of here documents, and old seds have small limits too (100 cmds). > echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS >-echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS >+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS > echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS > echo ' :' >>$CONFIG_STATUS > rm -f conftest.tail >@@ -7976,7 +7458,7 @@ > mv conftest.tail conftest.defines > done > rm -f conftest.defines >-echo ' fi # egrep' >>$CONFIG_STATUS >+echo ' fi # grep' >>$CONFIG_STATUS > echo >>$CONFIG_STATUS > > # Break up conftest.undefs because some shells have a limit on the size >@@ -8016,7 +7498,7 @@ > cat $tmp/in >>$tmp/config.h > rm -f $tmp/in > if test x"$ac_file" != x-; then >- if cmp -s $ac_file $tmp/config.h 2>/dev/null; then >+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then > { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 > echo "$as_me: $ac_file is unchanged" >&6;} > else >@@ -8032,25 +7514,30 @@ > /^X\(\/\/\)$/{ s//\1/; q; } > /^X\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` >- { case "$ac_dir" in >- [\\/]* | ?:[\\/]* ) as_incr_dir=;; >- *) as_incr_dir=.;; >-esac >-as_dummy="$ac_dir" >-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do >- case $as_mkdir_dir in >- # Skip DOS drivespec >- ?:) as_incr_dir=$as_mkdir_dir ;; >- *) >- as_incr_dir=$as_incr_dir/$as_mkdir_dir >- test -d "$as_incr_dir" || >- mkdir "$as_incr_dir" || >- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 >-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} >- { (exit 1); exit 1; }; } >- ;; >- esac >-done; } >+ { if $as_mkdir_p; then >+ mkdir -p "$ac_dir" >+ else >+ as_dir="$ac_dir" >+ as_dirs= >+ while test ! -d "$as_dir"; do >+ as_dirs="$as_dir $as_dirs" >+ as_dir=`(dirname "$as_dir") 2>/dev/null || >+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >+ X"$as_dir" : 'X\(//\)[^/]' \| \ >+ X"$as_dir" : 'X\(//\)$' \| \ >+ X"$as_dir" : 'X\(/\)' \| \ >+ . : '\(.\)' 2>/dev/null || >+echo X"$as_dir" | >+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } >+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } >+ /^X\(\/\/\)$/{ s//\1/; q; } >+ /^X\(\/\).*/{ s//\1/; q; } >+ s/.*/./; q'` >+ done >+ test ! -n "$as_dirs" || mkdir $as_dirs >+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 >+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} >+ { (exit 1); exit 1; }; }; } > > rm -f $ac_file > mv $tmp/config.h $ac_file >@@ -8115,7 +7602,7 @@ > # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be > # absolute. > ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` >-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` >+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` > ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` > ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` > >@@ -8214,25 +7701,30 @@ > /^X\(\/\/\)$/{ s//\1/; q; } > /^X\(\/\).*/{ s//\1/; q; } > s/.*/./; q'` >- { case $dirpart/$fdir in >- [\\/]* | ?:[\\/]* ) as_incr_dir=;; >- *) as_incr_dir=.;; >-esac >-as_dummy=$dirpart/$fdir >-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do >- case $as_mkdir_dir in >- # Skip DOS drivespec >- ?:) as_incr_dir=$as_mkdir_dir ;; >- *) >- as_incr_dir=$as_incr_dir/$as_mkdir_dir >- test -d "$as_incr_dir" || >- mkdir "$as_incr_dir" || >- { { echo "$as_me:$LINENO: error: cannot create $dirpart/$fdir" >&5 >-echo "$as_me: error: cannot create $dirpart/$fdir" >&2;} >- { (exit 1); exit 1; }; } >- ;; >- esac >-done; } >+ { if $as_mkdir_p; then >+ mkdir -p $dirpart/$fdir >+ else >+ as_dir=$dirpart/$fdir >+ as_dirs= >+ while test ! -d "$as_dir"; do >+ as_dirs="$as_dir $as_dirs" >+ as_dir=`(dirname "$as_dir") 2>/dev/null || >+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ >+ X"$as_dir" : 'X\(//\)[^/]' \| \ >+ X"$as_dir" : 'X\(//\)$' \| \ >+ X"$as_dir" : 'X\(/\)' \| \ >+ . : '\(.\)' 2>/dev/null || >+echo X"$as_dir" | >+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } >+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } >+ /^X\(\/\/\)$/{ s//\1/; q; } >+ /^X\(\/\).*/{ s//\1/; q; } >+ s/.*/./; q'` >+ done >+ test ! -n "$as_dirs" || mkdir $as_dirs >+ fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 >+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} >+ { (exit 1); exit 1; }; }; } > > # echo "creating $dirpart/$file" > echo '# dummy' > "$dirpart/$file" >@@ -8264,8 +7756,11 @@ > # need to make the FD available again. > if test "$no_create" != yes; then > ac_cs_success=: >+ ac_config_status_args= >+ test "$silent" = yes && >+ ac_config_status_args="$ac_config_status_args --quiet" > exec 5>/dev/null >- $SHELL $CONFIG_STATUS || ac_cs_success=false >+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false > exec 5>>config.log > # Use ||, not &&, to avoid exiting from the if with $? = 1, which > # would make configure fail if this is the last instruction. >diff -ur sodipodi-0.31/configure.in sodipodi-0.31.fix2/configure.in >--- sodipodi-0.31/configure.in 2003-02-22 08:14:33.000000000 -0500 >+++ sodipodi-0.31.fix2/configure.in 2003-03-13 18:01:41.000000000 -0500 >@@ -14,6 +14,7 @@ > AC_PROG_CC > AM_PROG_CC_STDC > AM_PROG_AS >+AC_PROG_RANLIB > AC_HEADER_STDC > > dnl Set PACKAGE_LOCALE_DIR in config.h. >@@ -115,6 +116,7 @@ > > if test "x$with_xft" != "xno"; then > dnl Have to test xft presence >+ CPPFLAGS="$CPPFLAGS -I /usr/include/freetype2" > AC_CHECK_HEADER(X11/Xft/Xft.h, xft_ok=yes, xft_ok=no) > if test "x$xft_ok" != "xyes"; then > dnl No xft found >diff -ur sodipodi-0.31/glade/Makefile.in sodipodi-0.31.fix2/glade/Makefile.in >--- sodipodi-0.31/glade/Makefile.in 2003-02-22 08:58:05.000000000 -0500 >+++ sodipodi-0.31.fix2/glade/Makefile.in 2003-03-14 11:38:18.000000000 -0500 >@@ -83,9 +83,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -95,10 +93,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -107,6 +107,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/src/Makefile.in sodipodi-0.31.fix2/src/Makefile.in >--- sodipodi-0.31/src/Makefile.in 2003-02-22 08:58:06.000000000 -0500 >+++ sodipodi-0.31.fix2/src/Makefile.in 2003-03-14 11:38:19.000000000 -0500 >@@ -88,9 +88,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -100,10 +98,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -112,6 +112,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/src/dialogs/Makefile.in sodipodi-0.31.fix2/src/dialogs/Makefile.in >--- sodipodi-0.31/src/dialogs/Makefile.in 2003-02-22 08:58:07.000000000 -0500 >+++ sodipodi-0.31.fix2/src/dialogs/Makefile.in 2003-03-14 11:34:59.000000000 -0500 >@@ -92,9 +92,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -104,10 +102,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -116,6 +116,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/src/display/Makefile.in sodipodi-0.31.fix2/src/display/Makefile.in >--- sodipodi-0.31/src/display/Makefile.in 2003-02-22 08:58:08.000000000 -0500 >+++ sodipodi-0.31.fix2/src/display/Makefile.in 2003-03-14 11:34:59.000000000 -0500 >@@ -112,9 +112,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -124,10 +122,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -136,6 +136,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/src/helper/Makefile.in sodipodi-0.31.fix2/src/helper/Makefile.in >--- sodipodi-0.31/src/helper/Makefile.in 2003-02-22 08:58:08.000000000 -0500 >+++ sodipodi-0.31.fix2/src/helper/Makefile.in 2003-03-14 11:34:59.000000000 -0500 >@@ -89,9 +89,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -101,10 +99,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -113,6 +113,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/src/libnr/Makefile.in sodipodi-0.31.fix2/src/libnr/Makefile.in >--- sodipodi-0.31/src/libnr/Makefile.in 2003-02-22 08:58:09.000000000 -0500 >+++ sodipodi-0.31.fix2/src/libnr/Makefile.in 2003-03-14 11:35:00.000000000 -0500 >@@ -83,9 +83,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -95,10 +93,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -107,6 +107,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/src/libnrtype/Makefile.in sodipodi-0.31.fix2/src/libnrtype/Makefile.in >--- sodipodi-0.31/src/libnrtype/Makefile.in 2003-02-22 08:58:09.000000000 -0500 >+++ sodipodi-0.31.fix2/src/libnrtype/Makefile.in 2003-03-14 11:35:00.000000000 -0500 >@@ -83,9 +83,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -95,10 +93,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -107,6 +107,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/src/svg/Makefile.in sodipodi-0.31.fix2/src/svg/Makefile.in >--- sodipodi-0.31/src/svg/Makefile.in 2003-02-22 08:58:10.000000000 -0500 >+++ sodipodi-0.31.fix2/src/svg/Makefile.in 2003-03-14 11:35:00.000000000 -0500 >@@ -91,9 +91,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -103,10 +101,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -115,6 +115,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/src/widgets/Makefile.in sodipodi-0.31.fix2/src/widgets/Makefile.in >--- sodipodi-0.31/src/widgets/Makefile.in 2003-02-22 08:58:10.000000000 -0500 >+++ sodipodi-0.31.fix2/src/widgets/Makefile.in 2003-03-14 11:35:00.000000000 -0500 >@@ -88,9 +88,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -100,10 +98,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -112,6 +112,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@ >diff -ur sodipodi-0.31/src/xml/Makefile.in sodipodi-0.31.fix2/src/xml/Makefile.in >--- sodipodi-0.31/src/xml/Makefile.in 2003-02-22 08:58:11.000000000 -0500 >+++ sodipodi-0.31.fix2/src/xml/Makefile.in 2003-03-14 11:35:01.000000000 -0500 >@@ -91,9 +91,7 @@ > GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@ > INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ > INSTOBJEXT = @INSTOBJEXT@ >-INTLDEPS = @INTLDEPS@ > INTLLIBS = @INTLLIBS@ >-INTLOBJS = @INTLOBJS@ > INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ > INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ > INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ >@@ -103,10 +101,12 @@ > INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ > INTLTOOL_PERL = @INTLTOOL_PERL@ > INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ >+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ > INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ > INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ > INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ > INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ >+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ > INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ > INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ > INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ >@@ -115,6 +115,8 @@ > PKG_CONFIG = @PKG_CONFIG@ > POFILES = @POFILES@ > POSUB = @POSUB@ >+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ >+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ > RANLIB = @RANLIB@ > SODIPODI_CFLAGS = @SODIPODI_CFLAGS@ > SODIPODI_LIBS = @SODIPODI_LIBS@
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=9398">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 17521
:
9397
| 9398
