diff -crN ./xscreensaver/aclocal.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/aclocal.m4 *** ./xscreensaver/aclocal.m4 Sat May 11 00:58:56 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/aclocal.m4 Thu Dec 18 23:38:04 2003 *************** *** 1,14 **** ! dnl aclocal.m4 generated automatically by aclocal 1.4-p5 - dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl This program is distributed in the hope that it will be useful, - dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without - dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A - dnl PARTICULAR PURPOSE. dnl AC_PROG_INTLTOOL([MINIMUM-VERSION]) --- 1,16 ---- ! # generated automatically by aclocal 1.7.1 -*- Autoconf -*- ! ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. ! # This file is free software; the Free Software Foundation ! # gives unlimited permission to copy and/or distribute it, ! # with or without modifications, as long as this notice is preserved. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A ! # PARTICULAR PURPOSE. dnl AC_PROG_INTLTOOL([MINIMUM-VERSION]) *************** *** 20,28 **** AC_MSG_CHECKING(for intltool >= $1) INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'` ! INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }' < intltool-update.in` changequote({{,}}) ! INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < intltool-update.in` changequote([,]) if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then --- 22,30 ---- AC_MSG_CHECKING(for intltool >= $1) INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'` ! INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }' < ${srcdir}/intltool-update.in` changequote({{,}}) ! INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${srcdir}/intltool-update.in` changequote([,]) if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then *************** *** 33,61 **** fi fi ! 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_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' ! INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! 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' AC_SUBST(INTLTOOL_DESKTOP_RULE) AC_SUBST(INTLTOOL_DIRECTORY_RULE) AC_SUBST(INTLTOOL_KEYS_RULE) AC_SUBST(INTLTOOL_OAF_RULE) AC_SUBST(INTLTOOL_PONG_RULE) AC_SUBST(INTLTOOL_SERVER_RULE) AC_SUBST(INTLTOOL_SHEET_RULE) AC_SUBST(INTLTOOL_SOUNDLIST_RULE) AC_SUBST(INTLTOOL_UI_RULE) AC_SUBST(INTLTOOL_XML_RULE) AC_SUBST(INTLTOOL_CAVES_RULE) # Use the tools built into the package, not the ones that are installed. --- 35,71 ---- fi fi ! INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p' ! INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(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) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(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) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(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) AC_SUBST(INTLTOOL_SHEET_RULE) AC_SUBST(INTLTOOL_SOUNDLIST_RULE) AC_SUBST(INTLTOOL_UI_RULE) + AC_SUBST(INTLTOOL_XAM_RULE) 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. *************** *** 81,87 **** AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) AC_DIVERT_POP() --- 91,97 ---- AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) AC_DIVERT_POP() *************** *** 90,96 **** AC_CONFIG_COMMANDS_PRE([ changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) ]) --- 100,106 ---- AC_CONFIG_COMMANDS_PRE([ changequote(,) mv -f po/POTFILES po/POTFILES.tmp ! sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp changequote([,]) ]) *************** *** 132,242 **** ]) ! # Macro to add for using GNU gettext. ! # Ulrich Drepper , 1995. ! # ! # Modified to never use included libintl. ! # Owen Taylor , 12/15/1998 # # # 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 :-( ] # ! # serial 5 ! AC_DEFUN(AM_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" ! nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" ! if test "$nls_cv_force_use_gnu_gettext" != "yes"; then ! dnl User does not insist on using GNU NLS library. Figure out what ! dnl to use. If gettext or catgets are available (in this order) we ! dnl use this. Else we have to fall back to GNU NLS library. ! dnl catgets is only used if permitted by option --with-catgets. ! nls_cv_header_intl= ! nls_cv_header_libgt= ! CATOBJEXT=NONE ! ! AC_CHECK_HEADER(libintl.h, ! [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ! [AC_TRY_LINK([#include ], [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_LIB(intl, bindtextdomain, ! [AC_CACHE_CHECK([for dgettext in libintl], ! gt_cv_func_dgettext_libintl, ! [AC_CHECK_LIB(intl, dgettext, ! gt_cv_func_dgettext_libintl=yes, ! gt_cv_func_dgettext_libintl=no)], ! gt_cv_func_dgettext_libintl=no)]) ! fi ! if test "$gt_cv_func_dgettext_libintl" = "yes"; then ! LIBS="$LIBS -lintl"; 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_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ! [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ! if test "$MSGFMT" != "no"; then ! AC_CHECK_FUNCS(dcgettext) ! AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ! AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ! [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ! AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ! return _nl_msg_cat_cntr], ! [CATOBJEXT=.gmo ! DATADIRNAME=share], ! [CATOBJEXT=.mo ! DATADIRNAME=lib]) ! INSTOBJEXT=.mo ! fi ! fi ! ! # 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 ! 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 fi ! fi ! if test "$nls_cv_use_gnu_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 Makefiles still can work. if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; --- 142,377 ---- ]) ! # Copyright (C) 1995-2002 Free Software Foundation, Inc. ! # Copyright (C) 2001-2003 Red Hat, Inc. # + # This file is free software, distributed under the terms of the GNU + # General Public License. As a special exception to the GNU General + # Public License, this file may be distributed as part of a program + # that contains a configuration script generated by Autoconf, under + # the same distribution terms as the rest of that program. # # 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. # + # Macro to add for using GNU gettext. + # Ulrich Drepper , 1995, 1996 + # + # Modified to never use included libintl. + # Owen Taylor , 12/15/1998 # ! # Major rework to remove unused code ! # Owen Taylor , 12/11/2002 # + # Added better handling of ALL_LINGUAS from GNU gettext version + # written by Bruno Haible, Owen Taylor 5/30/3002 ! # ! # 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 ], [return LC_MESSAGES], ! am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ! if test $am_cv_val_LC_MESSAGES = yes; then ! AC_DEFINE(HAVE_LC_MESSAGES, 1, ! [Define if your file defines LC_MESSAGES.]) ! fi ! fi]) ! ! # 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]]) ! 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]) ! AC_CACHE_VAL(ac_cv_path_$1, ! [case "[$]$1" in ! /*) ! ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in ifelse([$5], , $PATH, [$5]); do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if [$3]; then ! ac_cv_path_$1="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! dnl If no 4th arg is given, leave the cache variable unset, ! dnl so AC_PATH_PROGS will keep looking. ! ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ! ])dnl ! ;; ! esac])dnl ! $1="$ac_cv_path_$1" ! if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ! AC_MSG_RESULT([$]$1) ! else ! AC_MSG_RESULT(no) ! fi ! AC_SUBST($1)dnl ! ]) ! # GLIB_WITH_NLS ! #----------------- ! glib_DEFUN([GLIB_WITH_NLS], dnl NLS is obligatory [USE_NLS=yes AC_SUBST(USE_NLS) ! gt_cv_have_gettext=no ! 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 ! ], ! [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 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 ! 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_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 ! glib_save_LIBS="$LIBS" ! LIBS="$LIBS $INTLLIBS" ! 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], ! [case $host in ! *-*-solaris*) ! dnl On Solaris, if bind_textdomain_codeset is in libc, ! dnl GNU format message catalog is always supported, ! dnl since both are added to the libc all together. ! dnl Hence, we'd like to go with DATADIRNAME=share and ! dnl and CATOBJEXT=.gmo in this case. ! AC_CHECK_FUNC(bind_textdomain_codeset, ! [CATOBJEXT=.gmo ! DATADIRNAME=share], ! [CATOBJEXT=.mo ! DATADIRNAME=lib]) ! ;; ! *) ! CATOBJEXT=.mo ! DATADIRNAME=lib ! ;; ! esac]) ! LIBS="$glib_save_LIBS" ! INSTOBJEXT=.mo ! else ! gt_cv_have_gettext=no ! fi ! fi ! ]) ! if test "$gt_cv_have_gettext" = "yes" ; then AC_DEFINE(ENABLE_NLS, 1, [always defined to indicate that i18n is enabled]) fi dnl Test whether we really found GNU xgettext. if test "$XGETTEXT" != ":"; then ! 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 : ; *************** *** 269,311 **** AC_SUBST(DATADIRNAME) AC_SUBST(GMOFILES) AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) AC_SUBST(INTLLIBS) ! AC_SUBST(INTLOBJS) AC_SUBST(POFILES) AC_SUBST(POSUB) ]) ! AC_DEFUN(AM_GLIB_GNU_GETTEXT, ! [AC_REQUIRE([AC_PROG_MAKE_SET])dnl ! AC_REQUIRE([AC_PROG_CC])dnl ! AC_REQUIRE([AC_PROG_RANLIB])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_LC_MESSAGES ! AM_GLIB_WITH_NLS ! if test "x$CATOBJEXT" != "x"; then if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else AC_MSG_CHECKING(for catalogs to be installed) NEW_LINGUAS= ! for lang in ${LINGUAS=$ALL_LINGUAS}; do ! case "$ALL_LINGUAS" in ! *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; ! esac done LINGUAS=$NEW_LINGUAS AC_MSG_RESULT($LINGUAS) --- 404,459 ---- AC_SUBST(DATADIRNAME) AC_SUBST(GMOFILES) AC_SUBST(INSTOBJEXT) AC_SUBST(INTLLIBS) ! AC_SUBST(PO_IN_DATADIR_TRUE) ! AC_SUBST(PO_IN_DATADIR_FALSE) AC_SUBST(POFILES) AC_SUBST(POSUB) ]) ! # 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 ! ! GLIB_LC_MESSAGES ! GLIB_WITH_NLS ! if test "$gt_cv_have_gettext" = "yes"; then if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else AC_MSG_CHECKING(for catalogs to be installed) NEW_LINGUAS= ! for presentlang in $ALL_LINGUAS; do ! useit=no ! if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ! desiredlanguages="$LINGUAS" ! else ! desiredlanguages="$ALL_LINGUAS" ! fi ! for desiredlang in $desiredlanguages; do ! # Use the presentlang catalog if desiredlang is ! # a. equal to presentlang, or ! # b. a variant of presentlang (because in this case, ! # presentlang can be used as a fallback for messages ! # which are not translated in the desiredlang catalog). ! case "$desiredlang" in ! "$presentlang"*) useit=yes;; ! esac ! done ! if test $useit = yes; then ! NEW_LINGUAS="$NEW_LINGUAS $presentlang" ! fi done LINGUAS=$NEW_LINGUAS AC_MSG_RESULT($LINGUAS) *************** *** 317,354 **** 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. MKINSTALLDIRS= ! # ! # jwz: fuck this! it puts hardcoded pathnames into the generated Makefiles! ! # ! # if test -n "$ac_aux_dir"; then ! # MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ! # fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi - - # jwz: you know what, screw it. Let's just use the version that I - # already computed in configure.in, instead of this version that came - # with the i18n crud, ok? - MKINSTALLDIRS="$INSTALL_DIRS" - - AC_SUBST(MKINSTALLDIRS) dnl Generate list of files to be processed by xgettext which will --- 465,480 ---- fi 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. MKINSTALLDIRS= ! if test -n "$ac_aux_dir"; then ! MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ! fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi AC_SUBST(MKINSTALLDIRS) dnl Generate list of files to be processed by xgettext which will *************** *** 368,440 **** < $srcdir/po/POTFILES.in > po/POTFILES ]) ! ! # Search path for a program which passes the given test. ! # Ulrich Drepper , 1996. ! # ! # This file can be copied and used freely without restrictions. It can ! # be used in projects which are not available under the GNU Public License ! # but which still want to provide support for the GNU gettext functionality. ! # Please note that the actual code is *not* freely available. ! ! # serial 1 ! ! dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ! dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ! AC_DEFUN([AM_PATH_PROG_WITH_TEST], ! [# Extract the first word of "$2", so it can be a program name with args. ! set dummy $2; ac_word=[$]2 ! AC_MSG_CHECKING([for $ac_word]) ! AC_CACHE_VAL(ac_cv_path_$1, ! [case "[$]$1" in ! /*) ! ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ! ;; ! *) ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in ifelse([$5], , $PATH, [$5]); do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! if [$3]; then ! ac_cv_path_$1="$ac_dir/$ac_word" ! break ! fi ! fi ! done ! IFS="$ac_save_ifs" ! dnl If no 4th arg is given, leave the cache variable unset, ! dnl so AC_PATH_PROGS will keep looking. ! ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ! ])dnl ! ;; ! esac])dnl ! $1="$ac_cv_path_$1" ! if test -n "[$]$1"; then ! AC_MSG_RESULT([$]$1) else ! AC_MSG_RESULT(no) fi ! AC_SUBST($1)dnl ]) ! # Check whether LC_MESSAGES is available in . ! # Ulrich Drepper , 1995. ! # ! # This file can be copied and used freely without restrictions. It can ! # be used in projects which are not available under the GNU Public License ! # but which still want to provide support for the GNU gettext functionality. ! # Please note that the actual code is *not* freely available. ! ! # serial 2 ! ! AC_DEFUN([AM_LC_MESSAGES], ! [if test $ac_cv_header_locale_h = yes; then ! AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ! [AC_TRY_LINK([#include ], [return LC_MESSAGES], ! am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ! if test $am_cv_val_LC_MESSAGES = yes; then ! AC_DEFINE(HAVE_LC_MESSAGES, 1, ! [Define if your file defines LC_MESSAGES.]) ! fi ! fi]) --- 494,525 ---- < $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" ! glib_save_exec_prefix="$exec_prefix" ! test "x$prefix" = xNONE && prefix=$ac_default_prefix ! test "x$exec_prefix" = xNONE && exec_prefix=$prefix ! if test "x$CATOBJEXT" = "x.mo" ; then ! localedir=`eval echo "${libdir}/locale"` else ! localedir=`eval echo "${datadir}/locale"` fi ! prefix="$glib_save_prefix" ! exec_prefix="$glib_save_exec_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 diff -crN ./xscreensaver/config.guess /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/config.guess *** ./xscreensaver/config.guess Mon Sep 9 09:33:43 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/config.guess Thu Dec 18 23:38:05 2003 *************** *** 1,9 **** #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-09-03' # 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 --- 1,9 ---- #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. ! timestamp='2001-09-04' # 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 *************** *** 24,32 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Originally written by Per Bothner . ! # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and --- 24,31 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Written by Per Bothner . ! # Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and *************** *** 88,127 **** exit 1 fi - trap 'exit 1' 1 2 15 ! # CC_FOR_BUILD -- compiler used by this script. Note that the use of a ! # compiler to aid in system detection is discouraged as it requires ! # temporary files to be created and, as you can see below, it is a ! # headache to deal with in a portable fashion. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! # This shell variable is my proudest work .. or something. --bje ! ! 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 $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 ; ! 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) --- 87,116 ---- exit 1 fi ! dummy=dummy-$$ ! trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 + # CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int dummy(){}" > $dummy.c ; ! for c in cc gcc c89 ; do ! ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; ! if test $? = 0 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; ! rm -f $dummy.c $dummy.o $dummy.rel ; 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' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) *************** *** 138,167 **** case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) ! # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. ! # ! # Note: NetBSD doesn't particularly care about the vendor ! # portion of the name. We always set it to "unknown". ! sysctl="sysctl -n hw.machine_arch" ! UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ! /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ! case "${UNAME_MACHINE_ARCH}" in ! armeb) machine=armeb-unknown ;; ! arm*) machine=arm-unknown ;; ! sh3el) machine=shl-unknown ;; ! sh3eb) machine=sh-unknown ;; ! *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. ! case "${UNAME_MACHINE_ARCH}" in ! arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null --- 127,155 ---- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) ! # Netbsd (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. ! # Determine the machine/vendor (is the vendor relevant). ! case "${UNAME_MACHINE}" in ! amiga) machine=m68k-unknown ;; ! arm32) machine=arm-unknown ;; ! atari*) machine=m68k-atari ;; ! sun3*) machine=m68k-sun ;; ! mac68k) machine=m68k-apple ;; ! macppc) machine=powerpc-apple ;; ! hp3[0-9][05]) machine=m68k-hp ;; ! ibmrt|romp-ibm) machine=romp-ibm ;; ! *) machine=${UNAME_MACHINE}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. ! case "${UNAME_MACHINE}" in ! i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null *************** *** 184,228 **** # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` --- 172,177 ---- *************** *** 231,237 **** # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build cat <$dummy.s .data \$Lformat: --- 180,185 ---- *************** *** 257,265 **** jsr \$26,exit .end main EOF $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then ! case `$dummy` in 0-0) UNAME_MACHINE="alpha" ;; --- 205,214 ---- jsr \$26,exit .end main EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then ! case `./$dummy` in 0-0) UNAME_MACHINE="alpha" ;; *************** *** 281,292 **** 2-1307) UNAME_MACHINE="alphaev68" ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; 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*:*) --- 230,238 ---- 2-1307) UNAME_MACHINE="alphaev68" ;; esac fi ! rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 301,311 **** Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; ! *:[Mm]orph[Oo][Ss]:*:*) ! echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition --- 247,275 ---- Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; ! arc64:OpenBSD:*:*) ! echo mips64el-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! arc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! hkmips:OpenBSD:*:*) ! echo mips-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! pmax:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! sgi:OpenBSD:*:*) ! echo mips-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! wgrisc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition *************** *** 327,336 **** NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; --- 291,296 ---- *************** *** 359,365 **** echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) ! UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) --- 319,325 ---- echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) ! UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) *************** *** 373,378 **** --- 333,344 ---- aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; + atari*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor *************** *** 399,404 **** --- 365,382 ---- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; *************** *** 438,457 **** } EOF $CC_FOR_BUILD $dummy.c -o $dummy \ ! && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && 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) - echo powerpc-harris-powermax - exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; --- 416,429 ---- } EOF $CC_FOR_BUILD $dummy.c -o $dummy \ ! && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; *************** *** 524,531 **** exit(0); } EOF ! $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 --- 496,503 ---- exit(0); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 *************** *** 534,540 **** fi exit 0 ;; *:AIX:*:[45]) ! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else --- 506,512 ---- fi exit 0 ;; *:AIX:*:[45]) ! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else *************** *** 574,581 **** 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) ! if [ -x /usr/bin/getconf ]; then ! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 --- 546,555 ---- 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) ! case "${HPUX_REV}" in ! 11.[0-9][0-9]) ! if [ -x /usr/bin/getconf ]; then ! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 *************** *** 584,596 **** case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac ! fi ! if [ "${HP_ARCH}" = "" ]; then ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include --- 558,570 ---- case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; esac ;; esac ! fi ;; ! esac ! if [ "${HP_ARCH}" = "" ]; then ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include *************** *** 623,632 **** exit (0); } EOF ! (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 echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; --- 597,606 ---- exit (0); } EOF ! (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 ! fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; *************** *** 661,668 **** exit (0); } EOF ! $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:*:* ) --- 635,642 ---- exit (0); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) *************** *** 690,695 **** --- 664,672 ---- parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; *************** *** 708,713 **** --- 685,693 ---- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; + CRAY*X-MP:*:*:*) + echo xmp-cray-unicos + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *************** *** 729,740 **** --- 709,726 ---- CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + CRAY-2:*:*:*) + echo cray2-cray-unicos + 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/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; *************** *** 745,763 **** echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #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*:*) echo ${UNAME_MACHINE}-pc-cygwin --- 731,740 ---- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ! exit 0 ;; ! *:OpenBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin *************** *** 768,776 **** i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - 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 --- 745,750 ---- *************** *** 796,825 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips ! #undef mipsel ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mipsel ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! rm -f $dummy.c && rmdir $tmpdir ! test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu --- 770,785 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in ! big) echo mips-unknown-linux-gnu && exit 0 ;; ! little) echo mipsel-unknown-linux-gnu && exit 0 ;; ! esac ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu *************** *** 868,875 **** # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ! # Set LC_ALL=C to ensure ld outputs messages in English. ! ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// --- 828,834 ---- # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ! ld_supported_targets=`cd /; ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// *************** *** 881,887 **** ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; --- 840,846 ---- ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; *************** *** 893,921 **** esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include ! #ifdef __ELF__ ! # ifdef __GLIBC__ ! # if __GLIBC__ >= 2 ! LIBC=gnu ! # else ! LIBC=gnulibc1 ! # endif ! # else ! LIBC=gnulibc1 ! # endif ! #else ! #ifdef __INTEL_COMPILER ! LIBC=gnu ! #else ! LIBC=gnuaout ! #endif ! #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 ;; i*86:DYNIX/ptx:4*:*) --- 852,883 ---- esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build ! cat >$dummy.c < ! #ifdef __cplusplus ! #include /* for printf() prototype */ ! int main (int argc, char *argv[]) { ! #else ! int main (argc, argv) int argc; char *argv[]; { ! #endif ! #ifdef __ELF__ ! # ifdef __GLIBC__ ! # if __GLIBC__ >= 2 ! printf ("%s-pc-linux-gnu\n", argv[1]); ! # else ! printf ("%s-pc-linux-gnulibc1\n", argv[1]); ! # endif ! # else ! printf ("%s-pc-linux-gnulibc1\n", argv[1]); ! # endif ! #else ! printf ("%s-pc-linux-gnuaout\n", argv[1]); ! #endif ! return 0; ! } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) *************** *** 953,965 **** UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ! UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ! (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ! (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 ! (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 ! (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else --- 915,927 ---- UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ! UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` ! (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 ! (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 ! (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ && UNAME_MACHINE=i686 ! (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else *************** *** 992,1003 **** # "miniframe" echo m68010-convergent-sysv exit 0 ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - 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) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` --- 954,962 ---- # "miniframe" echo m68010-convergent-sysv 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 | 4850:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` *************** *** 1088,1096 **** 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 ;; --- 1047,1052 ---- *************** *** 1101,1117 **** echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) ! UNAME_PROCESSOR=`uname -p` ! if test "$UNAME_PROCESSOR" = "x86"; then ! UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi ! echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) --- 1057,1071 ---- echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) ! if test "${UNAME_MACHINE}" = "x86pc"; then UNAME_MACHINE=pc fi ! echo `uname -p`-${UNAME_MACHINE}-nto-qnx exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; ! NSR-[KW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) *************** *** 1283,1290 **** } EOF ! $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. --- 1237,1244 ---- } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy # Apollos put the system type in the environment. diff -crN ./xscreensaver/config.h.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/config.h.in *** ./xscreensaver/config.h.in Wed May 29 01:44:37 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/config.h.in Thu Dec 18 23:38:51 2003 *************** *** 1,418 **** ! /* config.h.in --- xscreensaver, Copyright (c) 1998-2000 Jamie Zawinski. ! * ! * The best way to set these parameters is by running the included `configure' ! * script. That examines your system, and generates `config.h' from ! * `config.h.in'. ! * ! * If something goes very wrong, you can edit `config.h' directly, but beware ! * that your changes will be lost if you ever run `configure' again. ! */ ! /* ************************************************************************* ! CONFIGURING SERVER EXTENSIONS ! ************************************************************************* */ ! /* Define this if you have the XReadDisplay extension (I think this is an ! SGI-only thing; it's in .) A few of the ! screenhacks will take advantage of this if it's available. ! */ ! #undef HAVE_READ_DISPLAY_EXTENSION ! /* Define this if you have the XHPDisableReset function (an HP only thing.) ! */ ! #undef HAVE_XHPDISABLERESET ! /* First, some background: there are three distinct server extensions which ! * are useful to a screen saver program: they are XIDLE, MIT-SCREEN-SAVER, ! * and SCREEN_SAVER. ! * ! * The XIDLE extension resides in .../contrib/extensions/xidle/ on the X11R5 ! * contrib tape. This extension lets the client get accurate idle-time ! * information from the X server in a potentially more reliable way than by ! * simply watching for keyboard and mouse activity. However, the XIDLE ! * extension has apparently not been ported to X11R6. ! * ! * The SCREEN_SAVER extension is found (as far as I know) only in the SGI ! * X server, and it exists in all releases since (at least) Irix 5. The ! * relevant header file is /usr/include/X11/extensions/XScreenSaver.h. ! * ! * The similarly-named MIT-SCREEN-SAVER extension came into existence long ! * after the SGI SCREEN_SAVER extension was already in use, and resides in ! * .../contrib/extensions/screensaver/ on the X11R6 contrib tape. It is ! * also found in certain recent X servers built in to NCD X terminals. ! * ! * The MIT extension does basically the same thing that the XIDLE extension ! * does, but there are two things wrong with it: first, because of the way ! * the extension was designed, the `fade' option to XScreenSaver will be ! * uglier: just before the screen fades out, there will be an unattractive ! * flicker to black, because this extension blanks the screen *before* ! * telling us that it is time to do so. Second, this extension is known to ! * be buggy; on the systems I use, it works, but some people have reported ! * X server crashes as a result of using it. XScreenSaver uses this ! * extension rather conservatively, because when I tried to use any of its ! * more complicated features, I could get it to crash the server at the ! * drop of a hat. ! * ! * In short, the MIT-SCREEN-SAVER extension is a piece of junk. The older ! * SGI SCREEN_SAVER extension works great, as does XIDLE. It would be nice ! * If those two existed on more systems, that is, would be adopted by the ! * X Consortium in favor of their inferior "not-invented-here" entry. ! */ ! ! /* Define this if you have the XIDLE extension installed. If you have the ! * XIDLE extension, this is recommended. (You have this extension if the ! * file /usr/include/X11/extensions/xidle.h exists.) Turning on this flag ! * lets XScreenSaver work better with servers which support this extension; ! * but it will still work with servers which do not suport it, so it's a good ! * idea to compile in support for it if you can. ! */ ! #undef HAVE_XIDLE_EXTENSION ! /* Define this if you have the MIT-SCREEN-SAVER extension installed. See the ! * caveats about this extension, above. (It's available if the file ! * /usr/include/X11/extensions/scrnsaver.h exists.) ! */ ! #undef HAVE_MIT_SAVER_EXTENSION ! /* Define this if you have the SGI SCREEN_SAVER extension. This is standard ! * on Irix systems, and not available elsewhere. ! */ ! #undef HAVE_SGI_SAVER_EXTENSION ! /* Define this if you have the SGI-VIDEO-CONTROL extension. This is standard ! * on Irix systems, and not available elsewhere. ! */ ! #undef HAVE_SGI_VC_EXTENSION ! /* Define this if you have the XDPMS extension. This is standard on ! * sufficiently-recent XFree86 systems, and possibly elsewhere. (It's ! * available if the file /usr/include/X11/extensions/dpms.h exists.) ! */ #undef HAVE_DPMS_EXTENSION ! /* Define this if you have the functions XF86VidModeGetModeLine() and ! * XF86VidModeGetViewPort(), in support of virtual desktops where the ! * X server's root window is bigger than the actual screen. This is ! * an XFree86 thing, and probably doesn't exist elsewhere. (It's ! * available if the file /usr/include/X11/extensions/xf86vmode.h exists.) ! */ ! #undef HAVE_XF86VMODE ! /* Define this if you have the functions XF86VidModeGetGamma() and ! * XF86VidModeSetGamma(), which allow clients to change the gamma ! * response of the monitor. This is an XFree86 4.0.x thing, and ! * probably doesn't exist elsewhere. (It's available if the file ! * /usr/include/X11/extensions/xf86vmode.h exists and has stuff about ! * gamma in it.) ! */ ! #undef HAVE_XF86VMODE_GAMMA ! /* Define this if you have the functions XF86VidModeGetGammaRamp() and ! * XF86VidModeSetGammaRamp(), which provide finer-grained control than ! * XF86VidMode[GS]etGamma(). These appeared in XFree86 4.1.0. ! */ ! #undef HAVE_XF86VMODE_GAMMA_RAMP ! /* Define this if you have the Xinerama extension. This is standard on ! * sufficiently-recent XFree86 systems, and possibly elsewhere. (It's ! * available if the file /usr/include/X11/extensions/Xinerama.h exists.) ! */ ! #undef HAVE_XINERAMA ! /* Define this if you have a Linux-like /proc/interrupts file which can be ! * examined to determine when keyboard activity has occurred. ! */ ! #undef HAVE_PROC_INTERRUPTS ! /* ************************************************************************* ! CONFIGURING GRAPHICS TOOLKITS ! ************************************************************************* */ ! /* Define this if you have Motif. ! */ ! #undef HAVE_MOTIF ! /* Define this if you have the XmComboBox Motif widget (Motif 2.0.) ! */ ! #undef HAVE_XMCOMBOBOX ! /* Define this if you have Gtk (any version.) ! */ #undef HAVE_GTK ! /* Define this if you have Gtk 2.x. ! */ #undef HAVE_GTK2 ! /* Define this if you have Gnome and want to build support for the ! xscreensaver control panel in the Gnome Control Center (gnomecc). ! (This is needed only with Gtk 1.x.) ! */ ! #undef HAVE_CRAPPLET ! /* Define this if HAVE_CRAPPLET is defined, and the function ! capplet_widget_changes_are_immediate() is available. ! */ ! #undef HAVE_CRAPPLET_IMMEDIATE ! /* Define this if you have the XML library. ! */ ! #undef HAVE_XML ! /* Define this if you have the XML library headers in their old, ! * non-namespaced location (you lack the gnome-xml/libxml symlink) ! */ ! #undef HAVE_OLD_XML_HEADERS ! /* Define this if you have the XPM library installed. Some of the demos can ! * make use of this if it is available. ! */ ! #undef HAVE_XPM ! /* Define this if you have the GDK_Pixbuf library installed. Some of the ! * demos can make use of this if it is available. ! */ ! #undef HAVE_GDK_PIXBUF ! /* Define this if you have the Independent JPEG Group's JPEG library ! * installed. Some of the demos can make use of this if it is available. ! */ ! #undef HAVE_JPEGLIB ! /* Define this if you have the Xmu library. This is standard part of X, and ! * if your vendor doesn't ship it, you should report that as a bug. ! */ ! #undef HAVE_XMU ! /* Define this if you have OpenGL. Some of the demos require it, so if you ! * don't have it, then those particular demos won't be built. (This won't ! * affect the screen saver as a whole.) ! */ ! #undef HAVE_GL ! /* Define this if you have OpenGL, but it's the MesaGL variant. (The ! libraries have different names.) (HAVE_GL should be defined too.) ! */ #undef HAVE_MESA_GL ! /* Define this if your version of OpenGL has the glBindTexture() routine. ! This is the case for OpenGL 1.1, but not for OpenGL 1.0. ! */ ! #undef HAVE_GLBINDTEXTURE ! /* Define this if you have the -lgle and -lmatrix libraries (GL extrusion.) ! */ ! #undef HAVE_GLE ! /* Define this if you have the -lgle from GLE version 3 ! */ ! #undef HAVE_GLE3 ! /* Define this if you have the X Shared Memory Extension. ! */ ! #undef HAVE_XSHM_EXTENSION ! /* Define this if you have the X Double Buffer Extension. ! */ ! #undef HAVE_DOUBLE_BUFFER_EXTENSION ! /* Some screenhacks like to run an external program to generate random pieces ! of text; set this to the one you like. Note that this is just the ! default; X resources can be used to override it. ! */ ! #define FORTUNE_PROGRAM "fortune" ! /* ************************************************************************* ! CONFIGURING PASSWORD AUTHENTICATION ! ************************************************************************* */ ! /* Define this to remove the option of locking the screen at all. ! */ ! #undef NO_LOCKING ! /* Define this if you want to use Kerberos authentication to lock/unlock the ! * screen instead of your local password. This currently uses Kerberos V4, ! * but a V5 server with V4 compatibility will work. WARNING: DO NOT USE AFS ! * string-to-key passwords with this option. This option currently *only* ! * works with standard Kerberos des_string_to_key. If your password is an ! * AFS password and not a kerberos password, it will not authenticate ! * properly. See the comments in driver/kpasswd.c for more information if you ! * need it. ! */ ! #undef HAVE_KERBEROS ! /* Define this if you have Kerberos 5, meaning we need to use the Kerberos 4 ! * compatibility layer. ! */ ! #undef HAVE_KERBEROS5 ! /* Define this if you want to use PAM (Pluggable Authentication Modules) ! * to lock/unlock the screen, instead of standard /etc/passwd authentication. ! */ ! #undef HAVE_PAM ! /* If PAM is being used, this is the name of the PAM service that xscreensaver ! * will authenticate as. The default is "xscreensaver", which means that the ! * PAM library will look for an "xscreensaver" line in /etc/pam.conf, or (on ! * recent Linux systems) will look for a file called /etc/pam.d/xscreensaver. ! * Some systems might already have a PAM installation that is configured for ! * xlock, so setting this to "xlock" would also work in that case. ! */ ! #define PAM_SERVICE_NAME "xscreensaver" ! /* Define if you have PAM and pam_strerror() requires two arguments. */ ! #undef PAM_STRERROR_TWO_ARGS ! /* Define this if your system uses `shadow' passwords, that is, the passwords ! * live in /etc/shadow instead of /etc/passwd, and one reads them with ! * getspnam() instead of getpwnam(). (Note that SCO systems do some random ! * other thing; others might as well. See the ifdefs in driver/passwd-pwent.c ! * if you're having trouble related to reading passwords.) ! */ #undef HAVE_SHADOW_PASSWD ! /* Define this if your system is Digital or SCO Unix with so-called ``Enhanced ! Security'', that is, the passwords live in /tcb/files/auth// ! instead of in /etc/passwd, and one reads them with getprpwnam() instead ! of getpwnam(). ! */ ! #undef HAVE_ENHANCED_PASSWD ! /* Define this if your system is Solaris with ``adjunct'' passwords (this is ! the version where one gets at the passwords with getpwanam() instead of ! getpwnam().) I haven't tested this one, let me know if it works. ! */ ! #undef HAVE_ADJUNCT_PASSWD ! /* Define this if you are running HPUX with so-called ``Secure Passwords'' ! (if you have /usr/include/hpsecurity.h, you probably have this.) I ! haven't tested this one, let me know if it works. ! */ ! #undef HAVE_HPUX_PASSWD ! /* Define this if you are on a system that supports the VT_LOCKSWITCH and ! VT_UNLOCKSWITCH ioctls. If this is defined, then when the screen is ! locked, switching to another virtual terminal will also be prevented. ! That is, the whole console will be locked, rather than just the VT on ! which X is running. (Well, that's the theory anyway -- in practice, ! I haven't yet figured out how to make that work.) ! */ ! #undef HAVE_VT_LOCKSWITCH ! /* Define this if you the openlog(), syslog(), and closelog() functions. ! This is used for logging failed login attempts. ! */ #undef HAVE_SYSLOG ! /* ************************************************************************* ! OTHER C ENVIRONMENT JUNK ! ************************************************************************* */ ! /* Define this to void* if you're using X11R4 or earlier. */ ! #undef XPointer ! /* Define if you have the nice function. */ ! #undef HAVE_NICE ! /* Define if you have the setpriority function. */ ! #undef HAVE_SETPRIORITY ! /* Define to empty if the keyword does not work. */ ! #undef const ! /* Define if you have that is POSIX.1 compatible. */ ! #undef HAVE_SYS_WAIT_H ! /* Define as __inline if that's what the C compiler calls it. */ ! #undef inline ! /* Define to `int' if doesn't define. */ ! #undef mode_t ! /* Define to `int' if doesn't define. */ ! #undef pid_t ! /* Define as the return type of signal handlers (int or void). */ ! #undef RETSIGTYPE ! /* Define to `unsigned' if doesn't define. */ ! #undef size_t ! /* Define if you have the ANSI C header files. */ ! #undef STDC_HEADERS ! /* Define if you can safely include both and . */ ! #undef TIME_WITH_SYS_TIME ! /* Define if you have the gettimeofday function. */ ! #undef HAVE_GETTIMEOFDAY ! /* Define if gettimeofday requires two arguments. */ ! #undef GETTIMEOFDAY_TWO_ARGS ! /* Define if you have the putenv function. */ ! #undef HAVE_PUTENV ! /* Define if you have the select function. */ ! #undef HAVE_SELECT ! /* Define if you have the getcwd function. */ ! #undef HAVE_GETCWD ! /* Define if you have the getcwd function. */ ! #undef HAVE_GETWD ! /* Define if you have the realpath function. */ ! #undef HAVE_REALPATH ! /* Define if you have the uname function. */ ! #undef HAVE_UNAME ! /* Define if you have the fcntl function. */ ! #undef HAVE_FCNTL ! /* Define if you have the sigaction function. */ ! #undef HAVE_SIGACTION ! /* Define this if you have the setrlimit function. */ ! #undef HAVE_SETRLIMIT ! /* Define if you have the sbrk function. */ ! #define HAVE_SBRK 1 ! /* Define if you have the header file. */ ! #undef HAVE_UNISTD_H ! /* Define if you have the header file. */ ! #undef HAVE_CRYPT_H ! /* Define if you have that defines fd_set and FD_SET. */ ! #undef HAVE_SYS_SELECT_H ! /* Define this if you do pings with a `struct icmp' and a `icmp_id' slot. ! */ ! #undef HAVE_ICMP ! /* Define this if you do pings with a `struct icmphdr' and a `un.echo.id' slot. ! */ ! #undef HAVE_ICMPHDR ! /* This is the name of the gettext package to use. ! */ ! #undef GETTEXT_PACKAGE ! /* This is the same as GETTEXT_PACKAGE, but for the glade generated ! * code. ! */ ! #undef PACKAGE ! /* Define this if you want to build with NLS support ! */ ! #undef ENABLE_NLS --- 1,355 ---- ! /* config.h.in. Generated from configure.in by autoheader. */ + /* always defined to indicate that i18n is enabled */ + #undef ENABLE_NLS ! /* $ac_cv_fortune_program */ ! #undef FORTUNE_PROGRAM ! /* $GETTEXT_PACKAGE */ ! #undef GETTEXT_PACKAGE ! /* Define if gettimeofday requires two arguments. */ ! #undef GETTIMEOFDAY_TWO_ARGS ! /* Define this if your system is Solaris with ``adjunct'' passwords (this is ! the version where one gets at the passwords with getpwanam() instead of ! getpwnam().) I haven't tested this one, let me know if it works.) */ ! #undef HAVE_ADJUNCT_PASSWD ! /* Define to 1 if you have the `bind_textdomain_codeset' function. */ ! #undef HAVE_BIND_TEXTDOMAIN_CODESET ! /* Define this if you have Gnome and want to build support for the ! xscreensaver control panel in the Gnome Control Center (gnomecc). (This is ! needed only with Gtk 1.x.) */ ! #undef HAVE_CRAPPLET ! /* Define this if HAVE_CRAPPLET is defined, and the function ! capplet_widget_changes_are_immediate() is available. */ ! #undef HAVE_CRAPPLET_IMMEDIATE ! ! /* Define to 1 if you have the header file. */ ! #undef HAVE_CRYPT_H ! ! /* Define to 1 if you have the `dcgettext' function. */ ! #undef HAVE_DCGETTEXT ! ! /* Define to 1 if you have the header file, and it defines `DIR'. ! */ ! #undef HAVE_DIRENT_H ! ! /* Define this if you have the X Double Buffer Extension. */ ! #undef HAVE_DOUBLE_BUFFER_EXTENSION ! /* Define this if you have the XDPMS extension. This is standard on ! sufficiently-recent XFree86 systems, and possibly elsewhere. (It's ! available if the file /usr/include/X11/extensions/dpms.h exists.) */ #undef HAVE_DPMS_EXTENSION ! /* Define this if your system is Digital or SCO Unix with so-called ``Enhanced ! Security'', that is, the passwords live in /tcb/files/auth// ! instead of in /etc/passwd, and one reads them with getprpwnam() instead of ! getpwnam(). */ ! #undef HAVE_ENHANCED_PASSWD ! /* Define to 1 if you have the `fcntl' function. */ ! #undef HAVE_FCNTL ! /* Define this if you have the GDK_Pixbuf library installed. Some of the demos ! can make use of this if it is available. */ ! #undef HAVE_GDK_PIXBUF ! /* Define to 1 if you have the `getcwd' function. */ ! #undef HAVE_GETCWD ! /* Define if the GNU gettext() function is already present or preinstalled. */ ! #undef HAVE_GETTEXT + /* Define if you have the gettimeofday function. */ + #undef HAVE_GETTIMEOFDAY + /* Define to 1 if you have the `getwd' function. */ + #undef HAVE_GETWD ! /* Define this if you have OpenGL. Some of the demos require it, so if you ! don't have it, then those particular demos won't be built. (This won't ! affect the screen saver as a whole.) */ ! #undef HAVE_GL ! /* Define this if your version of OpenGL has the glBindTexture() routine. This ! is the case for OpenGL 1.1, but not for OpenGL 1.0. */ ! #undef HAVE_GLBINDTEXTURE ! /* Define this if you have the -lgle and -lmatrix libraries (GL extrusion.) */ ! #undef HAVE_GLE ! ! /* Define this if you have the -lgle from GLE version 3 */ ! #undef HAVE_GLE3 ! /* Define this if you have Gtk (any version.) */ #undef HAVE_GTK ! /* Define this if you have Gtk 2.x. */ #undef HAVE_GTK2 ! /* Define this if you are running HPUX with so-called ``Secure Passwords'' (if ! you have /usr/include/hpsecurity.h, you probably have this.) I haven't ! tested this one, let me know if it works. */ ! #undef HAVE_HPUX_PASSWD ! /* Define this if you do pings with a `struct icmp' and a `icmp_id' slot. */ ! #undef HAVE_ICMP ! /* Define this if you do pings with a `struct icmphdr' and a `un.echo.id' ! slot. */ ! #undef HAVE_ICMPHDR ! /* Define to 1 if you have the header file. */ ! #undef HAVE_INTTYPES_H ! /* Define this if you have the Independent JPEG Group's JPEG library ! installed. Some of the demos can make use of this if it is available. */ ! #undef HAVE_JPEGLIB ! /* Define this if you want to use Kerberos authentication to lock/unlock the ! screen instead of your local password. This currently uses Kerberos V4, but ! a V5 server with V4 compatibility will work. WARNING: DO NOT USE AFS ! string-to-key passwords with this option. This option currently *only* ! works with standard Kerberos des_string_to_key. If your password is an AFS ! password and not a kerberos password, it will not authenticate properly. ! See the comments in driver/kpasswd.c for more information if you need it. ! */ ! #undef HAVE_KERBEROS ! /* Define this if you have Kerberos 5, meaning we need to use the Kerberos 4 ! compatibility layer. */ ! #undef HAVE_KERBEROS5 ! /* Define if your file defines LC_MESSAGES. */ ! #undef HAVE_LC_MESSAGES ! /* Define to 1 if you have the header file. */ ! #undef HAVE_LOCALE_H ! /* Define to 1 if you have the header file. */ ! #undef HAVE_MEMORY_H ! ! /* Define this if you have OpenGL, but it's the MesaGL variant. (The libraries ! have different names.) (HAVE_GL should be defined too.) */ #undef HAVE_MESA_GL ! /* Define this if you have the MIT-SCREEN-SAVER extension installed. See the ! caveats about this extension, above. (It's available if the file ! /usr/include/X11/extensions/scrnsaver.h exists.) */ ! #undef HAVE_MIT_SAVER_EXTENSION ! /* Define this if you have Motif. */ ! #undef HAVE_MOTIF ! /* Define to 1 if you have the header file, and it defines `DIR'. */ ! #undef HAVE_NDIR_H ! /* Define to 1 if you have the `nice' function. */ ! #undef HAVE_NICE ! /* Define this if you have the XML library headers in their old, ! non-namespaced location (you lack the gnome-xml/libxml symlink) */ ! #undef HAVE_OLD_XML_HEADERS ! /* Define this if you want to use PAM (Pluggable Authentication Modules) to ! lock/unlock the screen, instead of standard /etc/passwd authentication. */ ! #undef HAVE_PAM + /* Define this if you have a Linux-like /proc/interrupts file which can be + examined to determine when keyboard activity has occurred. */ + #undef HAVE_PROC_INTERRUPTS + /* Define to 1 if you have the `putenv' function. */ + #undef HAVE_PUTENV ! /* Define this if you have the XReadDisplay extension (I think this is an ! SGI-only thing; it's in .) A few of the ! screenhacks will take advantage of this if it's available. */ ! #undef HAVE_READ_DISPLAY_EXTENSION ! /* Define to 1 if you have the `realpath' function. */ ! #undef HAVE_REALPATH ! /* Define to 1 if you have the `sbrk' function. */ ! #undef HAVE_SBRK ! /* Define to 1 if you have the `select' function. */ ! #undef HAVE_SELECT ! /* Define to 1 if you have the `setpriority' function. */ ! #undef HAVE_SETPRIORITY ! ! /* Define to 1 if you have the `setrlimit' function. */ ! #undef HAVE_SETRLIMIT ! /* Define this if you have the SGI SCREEN_SAVER extension. This is standard on ! Irix systems, and not available elsewhere. */ ! #undef HAVE_SGI_SAVER_EXTENSION ! /* Define this if you have the SGI-VIDEO-CONTROL extension. This is standard ! on Irix systems, and not available elsewhere. */ ! #undef HAVE_SGI_VC_EXTENSION ! /* Define this if your system is Digital or SCO Unix with so-called ``Enhanced ! Security'', that is, the passwords live in /tcb/files/auth// ! instead of in /etc/passwd, and one reads them with getprpwnam() instead of ! getpwnam(). */ #undef HAVE_SHADOW_PASSWD ! /* Define to 1 if you have the `sigaction' function. */ ! #undef HAVE_SIGACTION ! /* Define to 1 if you have the header file. */ ! #undef HAVE_STDINT_H ! /* Define to 1 if you have the header file. */ ! #undef HAVE_STDLIB_H ! /* Define to 1 if you have the header file. */ ! #undef HAVE_STRINGS_H + /* Define to 1 if you have the header file. */ + #undef HAVE_STRING_H ! /* Define to 1 if you have the `syslog' function. */ #undef HAVE_SYSLOG + /* Define to 1 if you have the header file, and it defines `DIR'. + */ + #undef HAVE_SYS_DIR_H + + /* Define to 1 if you have the header file, and it defines `DIR'. + */ + #undef HAVE_SYS_NDIR_H ! /* Define to 1 if you have the header file. */ ! #undef HAVE_SYS_SELECT_H ! /* Define to 1 if you have the header file. */ ! #undef HAVE_SYS_STAT_H ! /* Define to 1 if you have the header file. */ ! #undef HAVE_SYS_TYPES_H ! /* Define to 1 if you have that is POSIX.1 compatible. */ ! #undef HAVE_SYS_WAIT_H ! /* Define to 1 if you have the `uname' function. */ ! #undef HAVE_UNAME ! /* Define to 1 if you have the header file. */ ! #undef HAVE_UNISTD_H ! /* Define this if you have the functions XF86VidModeGetModeLine() and ! XF86VidModeGetViewPort(), in support of virtual desktops where the X ! server's root window is bigger than the actual screen. This is an XFree86 ! thing, and probably doesn't exist elsewhere. (It's available if the file ! /usr/include/X11/extensions/xf86vmode.h exists.) */ ! #undef HAVE_XF86VMODE ! /* Define this if you have the functions XF86VidModeGetGamma() and ! XF86VidModeSetGamma(), which allow clients to change the gamma response of ! the monitor. This is an XFree86 4.0.x thing, and probably doesn't exist ! elsewhere. (It's available if the file ! /usr/include/X11/extensions/xf86vmode.h exists and has stuff about gamma in ! it.) */ ! #undef HAVE_XF86VMODE_GAMMA ! /* Define this if you have the functions XF86VidModeGetGammaRamp() and ! XF86VidModeSetGammaRamp(), which provide finer-grained control than ! XF86VidMode[GS]etGamma(). These appeared in XFree86 4.1.0. */ ! #undef HAVE_XF86VMODE_GAMMA_RAMP ! /* Define this if you have the XHPDisableReset function (an HP only thing.) */ ! #undef HAVE_XHPDISABLERESET ! /* Define this if you have the XIDLE extension installed. If you have the ! XIDLE extension, this is recommended. (You have this extension if the file ! /usr/include/X11/extensions/xidle.h exists.) Turning on this flag lets ! XScreenSaver work better with servers which support this extension; but it ! will still work with servers which do not suport it, so it's a good idea to ! compile in support for it if you can. */ ! #undef HAVE_XIDLE_EXTENSION ! /* Define this if you have the Xinerama extension. This is standard on ! sufficiently-recent XFree86 systems, and possibly elsewhere. (It's ! available if the file /usr/include/X11/extensions/Xinerama.h exists.) */ ! #undef HAVE_XINERAMA ! /* Define this if you have the XmComboBox Motif widget (Motif 2.0.) */ ! #undef HAVE_XMCOMBOBOX ! /* Define this if you have the XML library. */ ! #undef HAVE_XML ! /* Define this if you have the Xmu library. This is standard part of X, and if ! your vendor doesn't ship it, you should report that as a bug. */ ! #undef HAVE_XMU ! /* Define this if you have the XPM library installed. Some of the demos can ! make use of this if it is available. */ ! #undef HAVE_XPM ! /* Define this if you have the X Shared Memory Extension. */ ! #undef HAVE_XSHM_EXTENSION ! /* Define this to remove the option of locking the screen at all. */ ! #undef NO_LOCKING ! /* $GETTEXT_PACKAGE */ ! #undef PACKAGE ! /* Define to the address where bug reports for this package should be sent. */ ! #undef PACKAGE_BUGREPORT ! /* Define to the full name of this package. */ ! #undef PACKAGE_NAME ! /* Define to the full name and version of this package. */ ! #undef PACKAGE_STRING ! /* Define to the one symbol short name of this package. */ ! #undef PACKAGE_TARNAME ! /* Define to the version of this package. */ ! #undef PACKAGE_VERSION ! /* Define if you have PAM and pam_strerror() requires two arguments. */ ! #undef PAM_STRERROR_TWO_ARGS ! /* Define as the return type of signal handlers (`int' or `void'). */ ! #undef RETSIGTYPE ! /* Define to 1 if you have the ANSI C header files. */ ! #undef STDC_HEADERS ! /* Define to 1 if you can safely include both and . */ ! #undef TIME_WITH_SYS_TIME ! /* char* */ ! #undef XPointer ! /* Define to 1 if the X Window System is missing or not being used. */ ! #undef X_DISPLAY_MISSING ! /* 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 `int' if does not define. */ ! #undef mode_t ! ! /* Define to `int' if does not define. */ ! #undef pid_t ! ! /* Define to `unsigned' if does not define. */ ! #undef size_t diff -crN ./xscreensaver/config.sub /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/config.sub *** ./xscreensaver/config.sub Mon Sep 9 09:34:06 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/config.sub Thu Dec 18 23:38:05 2003 *************** *** 1,9 **** #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-09-05' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- 1,9 ---- #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. ! timestamp='2001-09-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software *************** *** 29,36 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. --- 29,35 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. *************** *** 118,124 **** # 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* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; --- 117,123 ---- # 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* | storm-chaos* | os2-emx* | windows32-*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; *************** *** 227,268 **** 1750a | 580 \ | a29k \ | 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 \ ! | d10v | d30v | dlx | dsp16xx \ ! | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ | m32r | m68000 | m68k | m88k | mcore \ ! | mips | mipsbe | mipseb | mipsel | mipsle \ ! | mips16 \ ! | mips64 | mips64el \ ! | mips64vr | mips64vrel \ ! | mips64orion | mips64orionel \ ! | mips64vr4100 | mips64vr4100el \ ! | mips64vr4300 | mips64vr4300el \ ! | mips64vr5000 | mips64vr5000el \ ! | mipsisa32 | mipsisa32el \ ! | mipsisa64 | mipsisa64el \ ! | mipsisa64sb1 | mipsisa64sb1el \ ! | mipsisa64sr71k | mipsisa64sr71kel \ ! | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | ns16k | ns32k \ ! | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ! | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ ! | strongarm \ | tahoe | thumb | tic80 | tron \ ! | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; --- 226,257 ---- 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | c4x | clipper \ ! | d10v | d30v | dsp16xx \ ! | fr30 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | m32r | m68000 | m68k | m88k | mcore \ ! | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ ! | mips64vr4100 | mips64vr4100el | mips64vr4300 \ ! | mips64vr4300el | mips64vr5000 | mips64vr5000el \ ! | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ ! | mipsisa32 \ | mn10200 | mn10300 \ | ns16k | ns32k \ ! | openrisc \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | s390 | s390x \ ! | sh | sh[34] | sh[34]eb | shbe | shle \ ! | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ ! | stormy16 | strongarm \ | tahoe | thumb | tic80 | tron \ ! | v850 \ | we32k \ ! | x86 | xscale \ | z8k) basic_machine=$basic_machine-unknown ;; *************** *** 289,339 **** 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ! | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ! | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ! | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* \ | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ ! | clipper-* | cydra-* \ ! | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ | m32r-* \ ! | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ ! | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ! | mips16-* \ ! | mips64-* | mips64el-* \ ! | mips64vr-* | mips64vrel-* \ ! | mips64orion-* | mips64orionel-* \ ! | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* \ ! | mips64vr5000-* | mips64vr5000el-* \ ! | mipsisa32-* | mipsisa32el-* \ ! | mipsisa64-* | mipsisa64el-* \ ! | mipsisa64sb1-* | mipsisa64sb1el-* \ ! | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ! | mipstx39 | mipstx39el \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ ! | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ! | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ ! | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) ;; --- 278,315 ---- 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ! | alphapca5[67]-* | arc-* \ ! | arm-* | armbe-* | armle-* | armv*-* \ | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c54x-* \ ! | clipper-* | cray2-* | cydra-* \ ! | d10v-* | d30v-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | m32r-* \ ! | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ ! | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ ! | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ ! | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ ! | s390-* | s390x-* \ ! | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ ! | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ ! | v850-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ | ymp-* \ | z8k-*) ;; *************** *** 398,407 **** basic_machine=ns32k-sequent os=-dynix ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; convex-c1) basic_machine=c1-convex os=-bsd --- 374,379 ---- *************** *** 422,429 **** basic_machine=c38-convex os=-bsd ;; ! cray | j90) ! basic_machine=j90-cray os=-unicos ;; crds | unos) --- 394,409 ---- basic_machine=c38-convex os=-bsd ;; ! cray | ymp) ! basic_machine=ymp-cray ! os=-unicos ! ;; ! cray2) ! basic_machine=cray2-cray ! os=-unicos ! ;; ! [cjt]90) ! basic_machine=${basic_machine}-cray os=-unicos ;; crds | unos) *************** *** 438,451 **** decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola --- 418,423 ---- *************** *** 626,631 **** --- 598,611 ---- basic_machine=m68k-atari os=-mint ;; + mipsel*-linux*) + basic_machine=mipsel-unknown + os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown + os=-linux-gnu + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; *************** *** 640,649 **** basic_machine=m68k-rom68k os=-coff ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; msdos) basic_machine=i386-pc os=-msdos --- 620,625 ---- *************** *** 723,732 **** basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose --- 699,704 ---- *************** *** 749,767 **** pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i686-pc ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) --- 721,739 ---- pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i686-pc ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) *************** *** 776,797 **** 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/^[^-]*-//'` ;; --- 748,769 ---- 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/^[^-]*-//'` ;; *************** *** 812,833 **** rtpc | rtpc-*) basic_machine=romp-ibm ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; sa29200) basic_machine=a29k-amd os=-udi ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; sequent) basic_machine=i386-sequent ;; --- 784,793 ---- *************** *** 835,841 **** basic_machine=sh-hitachi os=-hms ;; ! sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; --- 795,801 ---- basic_machine=sh-hitachi os=-hms ;; ! sparclite-wrs) basic_machine=sparclite-wrs os=-vxworks ;; *************** *** 901,922 **** basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) ! basic_machine=alphaev5-cray ! os=-unicos ! ;; ! t90) ! basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff --- 861,870 ---- basic_machine=i386-sequent os=-dynix ;; t3e) ! basic_machine=t3e-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff *************** *** 927,936 **** tx39el) basic_machine=mipstx39el-unknown ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; tower | tower-32) basic_machine=m68k-ncr ;; --- 875,880 ---- *************** *** 955,962 **** os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks --- 899,906 ---- os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks *************** *** 981,993 **** basic_machine=i386-pc os=-windows32-msvcrt ;; ! xps | xps100) ! basic_machine=xps100-honeywell ! ;; ! ymp) ! basic_machine=ymp-cray os=-unicos ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim --- 925,937 ---- basic_machine=i386-pc os=-windows32-msvcrt ;; ! xmp) ! basic_machine=xmp-cray os=-unicos ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim *************** *** 1008,1013 **** --- 952,964 ---- op60c) basic_machine=hppa1.1-oki ;; + mips) + if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips + fi + ;; romp) basic_machine=romp-ibm ;; *************** *** 1027,1042 **** we32k) basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) --- 978,990 ---- we32k) basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb) basic_machine=sh-unknown ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) *************** *** 1051,1056 **** --- 999,1008 ---- pmac | pmac-mpw) basic_machine=powerpc-apple ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; *************** *** 1116,1123 **** | -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*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) --- 1068,1074 ---- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ! | -os2* | -vos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) *************** *** 1169,1188 **** -acis*) os=-aos ;; - -atheos*) - os=-atheos - ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; - -nova*) - os=-rtmk-nova - ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) os=-nsk --- 1120,1133 ---- -acis*) os=-aos ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) os=-nsk *************** *** 1221,1228 **** -xenix) os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ;; -none) ;; --- 1166,1173 ---- -xenix) os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ;; -none) ;; *************** *** 1255,1265 **** arm*-semi) os=-aout ;; - # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; *-dec | vax-*) --- 1200,1209 ---- arm*-semi) os=-aout ;; pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; *-dec | vax-*) *************** *** 1286,1294 **** mips*-*) os=-elf ;; - or32-*) - os=-coff - ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; --- 1230,1235 ---- *************** *** 1352,1370 **** *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) --- 1293,1311 ---- *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) *************** *** 1436,1442 **** -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) --- 1377,1383 ---- -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks*) vendor=wrs ;; -aux*) diff -crN ./xscreensaver/configure /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/configure *** ./xscreensaver/configure Thu Oct 24 04:26:17 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/configure Thu Dec 18 23:39:44 2003 *************** *** 1,19 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.53. # # 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. ## ## --------------------- ## --- 1,11 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.54. # # 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. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## *************** *** 22,32 **** if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: 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 --- 14,26 ---- 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 # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset *************** *** 34,67 **** 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; } # Name of the executable. ! as_me=`(basename "$0") 2>/dev/null || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ --- 28,66 ---- as_unset=false fi ! ! # 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_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES 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=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ *************** *** 72,77 **** --- 71,77 ---- /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' *************** *** 85,91 **** echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh ! if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: --- 85,91 ---- echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh ! if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: *************** *** 138,143 **** --- 138,145 ---- 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,215 **** --- 212,223 ---- 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,232 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } # Name of the host. --- 234,240 ---- IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH # Name of the host. *************** *** 240,245 **** --- 248,254 ---- # Initializations. # ac_default_prefix=/usr/local + ac_config_libobj_dir=. cross_compiling=no subdirs= MFLAGS= *************** *** 296,301 **** --- 305,312 ---- # include #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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE EGREP PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS 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_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL 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 glib_config gtk_config gnome_config have_gnome_help xml_config gdk_pixbuf_config fortune_tmp INCLUDES PREFERRED_DEMO_PROGRAM ALL_DEMO_PROGRAMS SAVER_LIBS MOTIF_LIBS GTK_LIBS XML_LIBS JPEG_LIBS HACK_LIBS XPM_LIBS GL_LIBS GLE_LIBS XDPMS_LIBS PASSWD_LIBS INSTALL_SETUID SETUID_HACKS INSTALL_DIRS NEED_SETUID INSTALL_PAM PASSWD_SRCS PASSWD_OBJS XMU_SRCS XMU_OBJS XMU_LIBS SAVER_GL_SRCS SAVER_GL_OBJS SAVER_GL_LIBS LOCK_SRCS LOCK_OBJS JPEG_EXES GL_EXES GL_UTIL_EXES GL_MEN GL_KLUDGE GLE_EXES GLE_MEN GLE_KLUDGE GNOMEHELP_Y GNOMEHELP_N HACKDIR GNOME_DATADIR GLADE_DATADIR PO_DATADIR GNOME_PANELDIR HACK_CONF_DIR GTK_EXTRA_OBJS APPDEFAULTS DEPEND DEPEND_FLAGS DEPEND_DEFINES LIBOBJS LTLIBOBJS' + ac_subst_files='' # Initialize some variables set by options. ac_init_help= *************** *** 719,724 **** --- 730,738 ---- { (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 *************** *** 769,777 **** Defaults for the options are specified in brackets. - Configuration: - -h, --help display this help and exit --help=short display options specific to this package --help=recursive display the short help of all the included packages --- 783,789 ---- *************** *** 800,809 **** Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] ! --x-includes=DIR X include files are in DIR ! --x-libraries=DIR X library files are in DIR --mandir=DIR man documentation [PREFIX/man] _ACEOF --- 812,827 ---- Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data [PREFIX/share] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] ! --oldincludedir=DIR C header files for non-gcc [/usr/include] ! --infodir=DIR info documentation [PREFIX/info] --mandir=DIR man documentation [PREFIX/man] _ACEOF *************** *** 836,841 **** --- 854,861 ---- Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-x use the X Window System + Installation options: --with-hackdir=DIR Where to install the hundreds of demo executables. *************** *** 959,965 **** # 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_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` --- 979,985 ---- # 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_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` *************** *** 999,1005 **** running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ --- 1019,1025 ---- running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.54. Invocation command line was $ $0 $@ *************** *** 1065,1076 **** *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) 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. done # When interrupted or exit'd, cleanup temporary files, and complete --- 1085,1093 ---- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac ! ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. + ac_sep=" " done # When interrupted or exit'd, cleanup temporary files, and complete *************** *** 1082,1087 **** --- 1099,1105 ---- # Save into config.log some information that might help in debugging. { echo + cat <<\_ASBOX ## ---------------- ## ## Cache variables. ## *************** *** 1104,1109 **** --- 1122,1156 ---- 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 ## ----------- ## *************** *** 1111,1117 **** ## ----------- ## _ASBOX echo ! sed "/^$/d" confdefs.h echo fi test "$ac_signal" != 0 && --- 1158,1164 ---- ## ----------- ## _ASBOX echo ! sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && *************** *** 1268,1274 **** ! ac_config_headers="$ac_config_headers config.h" echo "current directory: `pwd`" --- 1315,1322 ---- ! ! ac_config_headers="$ac_config_headers config.h" echo "current directory: `pwd`" *************** *** 1736,1744 **** # 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="$@" fi fi fi --- 1784,1790 ---- # 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 ! ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi *************** *** 1871,1882 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 1917,1922 ---- *************** *** 1905,1915 **** # 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 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;; --- 1945,1954 ---- # 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 a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do ! test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; *************** *** 1923,1930 **** 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;} { (exit 77); exit 77; }; } fi --- 1962,1971 ---- else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! { { echo "$as_me:$LINENO: error: C compiler cannot create executables ! check \`config.log' for details." >&5 ! echo "$as_me: error: C compiler cannot create executables ! check \`config.log' for details." >&2;} { (exit 77); exit 77; }; } fi *************** *** 1981,1989 **** # 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 case $ac_file in ! *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; --- 2022,2031 ---- # 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 conftest.exe conftest conftest.*; do ! test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; *************** *** 2012,2023 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 2054,2059 ---- *************** *** 2034,2040 **** (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_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac --- 2070,2076 ---- (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 | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac *************** *** 2062,2073 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 2098,2103 ---- *************** *** 2116,2127 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 2146,2151 ---- *************** *** 2167,2172 **** --- 2191,2287 ---- 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" + #include "confdefs.h" + #include + #include + #include + #include + /* 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 + 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 + # 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 *************** *** 2202,2213 **** #include "confdefs.h" #include $ac_declaration - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 2317,2322 ---- *************** *** 2239,2250 **** #line $LINENO "configure" #include "confdefs.h" $ac_declaration - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 2348,2353 ---- *************** *** 2301,2309 **** CC="$CC -Ae" ;; *-aix* ) ! echo "$as_me:$LINENO: result: AIX: adding -qlanglvl=ansi -qhalt=e" >&5 ! echo "${ECHO_T}AIX: adding -qlanglvl=ansi -qhalt=e" >&6 ! CC="$CC -qlanglvl=ansi -qhalt=e" ;; *-dec-* ) --- 2404,2412 ---- CC="$CC -Ae" ;; *-aix* ) ! echo "$as_me:$LINENO: result: AIX: adding -qlanglvl=ansi" >&5 ! echo "${ECHO_T}AIX: adding -qlanglvl=ansi" >&6 ! CC="$CC -qlanglvl=ansi" ;; *-dec-* ) *************** *** 2355,2367 **** echo "$as_me: error: Couldn't build even a trivial ANSI C program: check CC." >&2;} { (exit 1); exit 1; }; } fi ! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test -n "$GCC"; then echo "$as_me:$LINENO: result: Turning on gcc compiler warnings." >&5 echo "${ECHO_T}Turning on gcc compiler warnings." >&6 ! CC="$CC -Wall -Wstrict-prototypes -Wnested-externs" else case "$host" in *-irix5* |*-irix6.0-3* ) --- 2458,2470 ---- echo "$as_me: error: Couldn't build even a trivial ANSI C program: check CC." >&2;} { (exit 1); exit 1; }; } fi ! rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test -n "$GCC"; then echo "$as_me:$LINENO: result: Turning on gcc compiler warnings." >&5 echo "${ECHO_T}Turning on gcc compiler warnings." >&6 ! CC="$CC -Wall -Wstrict-prototypes -Wnested-externs -Wno-format" else case "$host" in *-irix5* |*-irix6.0-3* ) *************** *** 2459,2465 **** 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 --- 2562,2568 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 2492,2498 **** 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 --- 2595,2601 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 2550,2556 **** 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 --- 2653,2659 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 2583,2589 **** 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 --- 2686,2692 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 2625,2727 **** ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - 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 - #include - #include - #include - /* 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 --- 2728,2733 ---- *************** *** 2731,2742 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 2737,2742 ---- *************** *** 2832,2839 **** #line $LINENO "configure" #include "confdefs.h" #ifndef __cplusplus ! static $ac_kw int static_foo () {return 0; } ! $ac_kw int foo () {return 0; } #endif _ACEOF --- 2832,2840 ---- #line $LINENO "configure" #include "confdefs.h" #ifndef __cplusplus ! typedef int foo_t; ! static $ac_kw foo_t static_foo () {return 0; } ! $ac_kw foo_t foo () {return 0; } #endif _ACEOF *************** *** 3064,3069 **** --- 3065,3085 ---- # random libc stuff + 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 *************** *** 3081,3087 **** 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 --- 3097,3103 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 3112,3118 **** _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no --- 3128,3134 ---- _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no *************** *** 3130,3136 **** _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no --- 3146,3152 ---- _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no *************** *** 3189,3195 **** ( exit $ac_status ) ac_cv_header_stdc=no fi ! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi --- 3205,3211 ---- ( exit $ac_status ) ac_cv_header_stdc=no fi ! rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi *************** *** 3316,3322 **** 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 --- 3332,3338 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 3384,3395 **** #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 () { --- 3400,3405 ---- *************** *** 3442,3453 **** #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 () { --- 3452,3457 ---- *************** *** 3500,3511 **** #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 () { --- 3504,3509 ---- *************** *** 3568,3579 **** void (*signal ()) (); #endif - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 3566,3571 ---- *************** *** 3622,3633 **** #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 3614,3619 ---- *************** *** 3684,3695 **** # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 3670,3675 ---- *************** *** 3749,3760 **** #include #include <$ac_hdr> - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 3729,3734 ---- *************** *** 3815,3826 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char opendir (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 3789,3794 ---- *************** *** 3861,3872 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char opendir (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 3829,3834 ---- *************** *** 3924,3935 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char opendir (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 3886,3891 ---- *************** *** 3970,3981 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char opendir (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 3926,3931 ---- *************** *** 4026,4037 **** #include "confdefs.h" #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 3976,3981 ---- *************** *** 4062,4073 **** #include "confdefs.h" #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4006,4011 ---- *************** *** 4102,4107 **** --- 4040,4047 ---- ac_gettimeofday_args=$ac_cv_gettimeofday_args if test "$ac_gettimeofday_args" = 1 ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_GETTIMEOFDAY 1 _ACEOF *************** *** 4109,4118 **** --- 4049,4062 ---- echo "$as_me:$LINENO: result: one argument" >&5 echo "${ECHO_T}one argument" >&6 elif test "$ac_gettimeofday_args" = 2 ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_GETTIMEOFDAY 1 _ACEOF + + cat >>confdefs.h <<\_ACEOF #define GETTIMEOFDAY_TWO_ARGS 1 _ACEOF *************** *** 4156,4167 **** char $ac_func (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4100,4105 ---- *************** *** 4236,4247 **** char $ac_func (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4174,4179 ---- *************** *** 4315,4326 **** #include #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4247,4252 ---- *************** *** 4367,4372 **** --- 4293,4300 ---- echo "$as_me:$LINENO: result: $ac_cv_have_icmp" >&5 echo "${ECHO_T}$ac_cv_have_icmp" >&6 if test "$ac_cv_have_icmp" = yes ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_ICMP 1 _ACEOF *************** *** 4399,4410 **** #include #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4327,4332 ---- *************** *** 4446,4451 **** --- 4368,4375 ---- echo "$as_me:$LINENO: result: $ac_cv_have_icmphdr" >&5 echo "${ECHO_T}$ac_cv_have_icmphdr" >&6 if test "$ac_cv_have_icmphdr" = yes ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_ICMPHDR 1 _ACEOF *************** *** 4507,4513 **** 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 --- 4431,4437 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 4566,4572 **** done ! for ac_prog in perl5 perl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 --- 4490,4500 ---- done ! ! if test "$PERL_PATH"; then ! PERL=$PERL_PATH ! fi ! for ac_prog in perl5 perl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 *************** *** 4736,4742 **** 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 --- 4664,4670 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 4775,4786 **** #line $LINENO "configure" #include "confdefs.h" #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4703,4708 ---- *************** *** 4878,4889 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4800,4805 ---- *************** *** 4921,4932 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4837,4842 ---- *************** *** 4989,5000 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XOpenDisplay (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4899,4904 ---- *************** *** 5037,5048 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dnet_ntoa (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4941,4946 ---- *************** *** 5097,5108 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dnet_ntoa (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 4995,5000 ---- *************** *** 5171,5182 **** char gethostbyname (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5063,5068 ---- *************** *** 5235,5246 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5121,5126 ---- *************** *** 5295,5306 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5175,5180 ---- *************** *** 5343,5349 **** # socket/setsockopt and other routines are undefined under SCO ODT # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary # on later versions), says Simon Leinen: it contains gethostby* ! # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. echo "$as_me:$LINENO: checking for connect" >&5 --- 5217,5223 ---- # socket/setsockopt and other routines are undefined under SCO ODT # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary # on later versions), says Simon Leinen: it contains gethostby* ! # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. echo "$as_me:$LINENO: checking for connect" >&5 *************** *** 5366,5377 **** char connect (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5240,5245 ---- *************** *** 5430,5441 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char connect (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5298,5303 ---- *************** *** 5494,5505 **** char remove (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5356,5361 ---- *************** *** 5558,5569 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char remove (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5414,5419 ---- *************** *** 5622,5633 **** char shmat (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5472,5477 ---- *************** *** 5686,5697 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shmat (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5530,5535 ---- *************** *** 5757,5768 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char IceConnectionNumber (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5595,5600 ---- *************** *** 6035,6046 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char regcmp (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5867,5872 ---- *************** *** 6094,6105 **** #line $LINENO "configure" #include "confdefs.h" #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 5920,5925 ---- *************** *** 6132,6137 **** --- 5952,5959 ---- echo "$as_me:$LINENO: result: $ac_cv_xpointer" >&5 echo "${ECHO_T}$ac_cv_xpointer" >&6 if test "$ac_cv_xpointer" != yes; then + + cat >>confdefs.h <<\_ACEOF #define XPointer char* _ACEOF *************** *** 6152,6160 **** echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6 INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ printf "%d", $1 * 100 + $2; }'` ! INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $2; }' < intltool-update.in` ! INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($2, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < intltool-update.in` if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then --- 5974,5982 ---- echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6 INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ printf "%d", $1 * 100 + $2; }'` ! INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $2; }' < ${srcdir}/intltool-update.in` ! INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($2, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${srcdir}/intltool-update.in` if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then *************** *** 6167,6183 **** fi fi ! 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_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' ! INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! 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' --- 5989,6013 ---- fi fi ! INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -p' ! INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(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) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(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) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache' ! INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(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) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache' ! ! ! ! *************** *** 6261,6271 **** # 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" GETTEXT_PACKAGE=xscreensaver cat >>confdefs.h <<_ACEOF #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" _ACEOF --- 6091,6105 ---- # 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" GETTEXT_PACKAGE=xscreensaver + + + + cat >>confdefs.h <<_ACEOF #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" _ACEOF *************** *** 6276,6387 **** ! ALL_LINGUAS="ca da de es et fi fr hu it ja ko nl no pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" ! 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 ! ! 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 --- 6110,6140 ---- ! # #### no sign of en_GB ! #ALL_LINGUAS="ca de en_GB et fr it ko pl sv da es fi hu ja no pt pt_BR ru wa" ! ALL_LINGUAS="ca de et fr it ko pl sv da es fi hu ja no pt pt_BR ru wa" ! 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 ! 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 *************** *** 6395,6441 **** 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 ! # 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 ! #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; } --- 6148,6247 ---- 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=$? + grep -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 ! ! 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include int main () { ! return LC_MESSAGES ; return 0; } *************** *** 6452,7155 **** 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 ! # define alloca _alloca ! # else ! # if HAVE_ALLOCA_H ! # include ! # 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 ! /* 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 ! /* 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 ! #include ! ! #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 ! # 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 ! fi ! 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 ! _ACEOF ! ! fi ! rm -f conftest.mmap ! ! ! ! ! ! ! ! ! ! ! for ac_header in argz.h limits.h locale.h nl_types.h malloc.h string.h \ ! unistd.h sys/param.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 --- 6258,6342 ---- ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 ! echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 ! if test $am_cv_val_LC_MESSAGES = yes; then cat >>confdefs.h <<\_ACEOF ! #define HAVE_LC_MESSAGES 1 _ACEOF ! fi ! fi ! USE_NLS=yes ! ! gt_cv_have_gettext=no ! ! CATOBJEXT=NONE ! XGETTEXT=: ! INTLLIBS= ! ! 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 echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 + echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 else ! # Is the header compilable? ! echo "$as_me:$LINENO: checking libintl.h usability" >&5 ! echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! $ac_includes_default ! #include _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 libintl.h presence" >&5 ! echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 7176,7226 **** # 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 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 --- 6363,6444 ---- # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) ! { 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;};; 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;};; esac ! 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ac_cv_header_libintl_h=$ac_header_preproc fi ! echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ! echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 fi + if test $ac_cv_header_libintl_h = yes; then + 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" + #include + int + main () + { + return (int) dgettext ("","") + ; + 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 + gt_cv_func_dgettext_libc=yes + else + echo "$as_me: failed program was:" >&5 + cat 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 + 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 *************** *** 7243,7254 **** char $ac_func (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 6461,6466 ---- *************** *** 7295,7321 **** fi done ! 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } #endif int main () { ! return LC_MESSAGES ; return 0; } --- 6507,6542 ---- 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 ! 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 else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lintl $LIBS" ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "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 bindtextdomain (); int main () { ! bindtextdomain (); ; return 0; } *************** *** 7332,7487 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi ! echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 ! echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 ! if test $am_cv_val_LC_MESSAGES = yes; then ! ! cat >>confdefs.h <<\_ACEOF ! #define HAVE_LC_MESSAGES 1 ! _ACEOF ! ! fi ! fi ! USE_NLS=yes ! ! ! nls_cv_force_use_gnu_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 ! ! 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 ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! fi ! echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ! echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 ! else ! # Is the header compilable? ! echo "$as_me:$LINENO: checking libintl.h usability" >&5 ! echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! $ac_includes_default ! #include ! _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 libintl.h presence" >&5 ! echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! #include "confdefs.h" ! #include ! _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: 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;};; ! 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;};; ! esac ! 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 ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! ac_cv_header_libintl_h=$ac_header_preproc ! fi ! echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ! echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 ! ! fi ! if test $ac_cv_header_libintl_h = yes; then ! 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" ! #include ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } #endif int main () { ! return (int) dgettext ("","") ; return 0; } --- 6553,6592 ---- ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_lib_intl_bindtextdomain=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_bindtextdomain" >&5 ! echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 ! if test $ac_cv_lib_intl_bindtextdomain = yes; then ! echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ! echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6 ! if test "${ac_cv_lib_intl_dgettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lintl $LIBS" ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "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 dgettext (); int main () { ! dgettext (); ; return 0; } *************** *** 7498,7522 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! gt_cv_func_dgettext_libc=yes else echo "$as_me: failed program was:" >&5 cat 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 ! if test "$gt_cv_func_dgettext_libc" != "yes"; then ! 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 else ac_check_lib_save_LIBS=$LIBS ! LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" --- 6603,6638 ---- ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_lib_intl_dgettext=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_dgettext" >&5 + echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6 + if test $ac_cv_lib_intl_dgettext = yes; then + gt_cv_func_dgettext_libintl=yes fi ! fi ! ! ! 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 "${ECHO_T}" >&6 ! 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 else ac_check_lib_save_LIBS=$LIBS ! LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" *************** *** 7527,7543 **** #endif /* 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 () { ! bindtextdomain (); ; return 0; } --- 6643,6653 ---- #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; } *************** *** 7554,7604 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_lib_intl_bindtextdomain=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_bindtextdomain" >&5 ! echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 ! if test $ac_cv_lib_intl_bindtextdomain = yes; then ! echo "$as_me:$LINENO: checking for dgettext in libintl" >&5 ! echo $ECHO_N "checking for dgettext in libintl... $ECHO_C" >&6 ! if test "${gt_cv_func_dgettext_libintl+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 else ! echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ! echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6 ! if test "${ac_cv_lib_intl_dgettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lintl $LIBS" ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "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 dgettext (); ! #ifdef F77_DUMMY_MAIN ! # ifdef __cplusplus ! extern "C" ! # endif ! int F77_DUMMY_MAIN() { return 1; } ! #endif int main () { ! dgettext (); ; return 0; } --- 6664,6734 ---- 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 cat 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" #include "confdefs.h" ! /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* 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) (); ! 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; } *************** *** 7615,7656 **** ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ! ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_lib_intl_dgettext=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_dgettext" >&5 - echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6 - if test $ac_cv_lib_intl_dgettext = yes; then - gt_cv_func_dgettext_libintl=yes - else - gt_cv_func_dgettext_libintl=no fi fi ! echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libintl" >&5 ! echo "${ECHO_T}$gt_cv_func_dgettext_libintl" >&6 ! fi ! fi ! if test "$gt_cv_func_dgettext_libintl" = "yes"; then ! LIBS="$LIBS -lintl"; fi ! if test "$gt_cv_func_dgettext_libc" = "yes" \ ! || test "$gt_cv_func_dgettext_libintl" = "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. 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 --- 6745,6796 ---- 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 ! 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 + 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_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. 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 *************** *** 7678,7691 **** esac fi MSGFMT="$ac_cv_path_MSGFMT" ! if test -n "$MSGFMT"; then echo "$as_me:$LINENO: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! if test "$MSGFMT" != "no"; then for ac_func in dcgettext do --- 6818,6833 ---- esac fi MSGFMT="$ac_cv_path_MSGFMT" ! if test "$MSGFMT" != "no"; then echo "$as_me:$LINENO: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi ! if test "$MSGFMT" != "no"; then ! glib_save_LIBS="$LIBS" ! LIBS="$LIBS $INTLLIBS" for ac_func in dcgettext do *************** *** 7710,7721 **** char $ac_func (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 6852,6857 ---- *************** *** 7762,7768 **** fi done ! # 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 --- 6898,6904 ---- fi done ! # 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 *************** *** 7802,7808 **** echo "${ECHO_T}no" >&6 fi ! # 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 --- 6938,6944 ---- echo "${ECHO_T}no" >&6 fi ! # 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 *************** *** 7830,7836 **** esac fi XGETTEXT="$ac_cv_path_XGETTEXT" ! if test -n "$XGETTEXT"; then echo "$as_me:$LINENO: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else --- 6966,6972 ---- esac fi XGETTEXT="$ac_cv_path_XGETTEXT" ! if test "$XGETTEXT" != ":"; then echo "$as_me:$LINENO: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else *************** *** 7838,7858 **** echo "${ECHO_T}no" >&6 fi ! 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 () { extern int _nl_msg_cat_cntr; ! return _nl_msg_cat_cntr ; return 0; } --- 6974,6988 ---- echo "${ECHO_T}no" >&6 fi ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" int main () { extern int _nl_msg_cat_cntr; ! return _nl_msg_cat_cntr ; return 0; } *************** *** 7870,7911 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CATOBJEXT=.gmo ! DATADIRNAME=share else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! CATOBJEXT=.mo ! 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 ! LIBS=`echo $LIBS | sed -e 's/-lintl//'` ! fi fi - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=yes - fi - fi ! if test "$nls_cv_use_gnu_gettext" != "yes"; then cat >>confdefs.h <<\_ACEOF #define ENABLE_NLS 1 _ACEOF - else - CATOBJEXT= fi if test "$XGETTEXT" != ":"; then --- 7000,7102 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CATOBJEXT=.gmo ! DATADIRNAME=share ! else ! echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! case $host in ! *-*-solaris*) ! echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 ! echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6 ! if test "${ac_cv_func_bind_textdomain_codeset+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 bind_textdomain_codeset (); below. */ ! #include ! /* 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 bind_textdomain_codeset (); ! char (*f) (); ! ! 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_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset) ! choke me ! #else ! f = bind_textdomain_codeset; ! #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 ! ac_cv_func_bind_textdomain_codeset=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ! ac_cv_func_bind_textdomain_codeset=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! fi ! echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 ! echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6 ! if test $ac_cv_func_bind_textdomain_codeset = yes; then ! CATOBJEXT=.gmo ! DATADIRNAME=share ! else ! CATOBJEXT=.mo ! DATADIRNAME=lib ! fi + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + fi ! if test "$gt_cv_have_gettext" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define ENABLE_NLS 1 _ACEOF fi if test "$XGETTEXT" != ":"; then *************** *** 7921,8100 **** # We need to process the po/ directory. POSUB=po ! ac_config_commands="$ac_config_commands default-2" for lang in $ALL_LINGUAS; do ! GMOFILES="$GMOFILES $lang.gmo" ! POFILES="$POFILES $lang.po" ! done ! ! ! ! ! ! ! ! ! ! ! ! ! ! if test "x$CATOBJEXT" != "x"; then ! if test "x$ALL_LINGUAS" = "x"; then ! LINGUAS= ! else ! echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 ! echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 ! NEW_LINGUAS= ! for lang in ${LINGUAS=$ALL_LINGUAS}; do ! case "$ALL_LINGUAS" in ! *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; ! esac ! done ! LINGUAS=$NEW_LINGUAS ! echo "$as_me:$LINENO: result: $LINGUAS" >&5 ! echo "${ECHO_T}$LINGUAS" >&6 ! fi ! ! if test -n "$LINGUAS"; then ! for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ! 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 ! _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 ! _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= ! # ! # jwz: fuck this! it puts hardcoded pathnames into the generated Makefiles! ! # ! # if test -n "$ac_aux_dir"; then ! # MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ! # fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi - # jwz: you know what, screw it. Let's just use the version that I - # already computed in configure.in, instead of this version that came - # with the i18n crud, ok? - MKINSTALLDIRS="$INSTALL_DIRS" - - - test -d po || mkdir po if test "x$srcdir" != "x."; then --- 7112,7183 ---- # We need to process the po/ directory. POSUB=po ! ac_config_commands="$ac_config_commands default-2" for lang in $ALL_LINGUAS; do ! GMOFILES="$GMOFILES $lang.gmo" ! POFILES="$POFILES $lang.po" ! done ! ! ! ! ! ! ! ! ! if test "$gt_cv_have_gettext" = "yes"; then ! if test "x$ALL_LINGUAS" = "x"; then ! LINGUAS= ! else ! echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 ! echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 ! NEW_LINGUAS= ! for presentlang in $ALL_LINGUAS; do ! useit=no ! if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ! desiredlanguages="$LINGUAS" ! else ! desiredlanguages="$ALL_LINGUAS" ! fi ! for desiredlang in $desiredlanguages; do ! # Use the presentlang catalog if desiredlang is ! # a. equal to presentlang, or ! # b. a variant of presentlang (because in this case, ! # presentlang can be used as a fallback for messages ! # which are not translated in the desiredlang catalog). ! case "$desiredlang" in ! "$presentlang"*) useit=yes;; ! esac ! done ! if test $useit = yes; then ! NEW_LINGUAS="$NEW_LINGUAS $presentlang" ! fi ! done ! LINGUAS=$NEW_LINGUAS ! echo "$as_me:$LINENO: result: $LINGUAS" >&5 ! echo "${ECHO_T}$LINGUAS" >&6 ! fi ! ! if test -n "$LINGUAS"; then ! for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ! fi fi MKINSTALLDIRS= ! if test -n "$ac_aux_dir"; then ! MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ! fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi test -d po || mkdir po if test "x$srcdir" != "x."; then *************** *** 8175,8180 **** --- 7258,7265 ---- XMU_SRCS='' XMU_OBJS='' XMU_LIBS='-lXmu' + + cat >>confdefs.h <<\_ACEOF #define HAVE_XMU 1 _ACEOF *************** *** 8210,8221 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 7295,7300 ---- *************** *** 8259,8270 **** #line $LINENO "configure" #include "confdefs.h" - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 7338,7343 ---- *************** *** 8460,8465 **** --- 7533,7540 ---- if test "$with_sgi" = yes; then + + ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" *************** *** 8501,8507 **** echo "${ECHO_T}$ac_cv_header_X11_extensions_XScreenSaver_h" >&6 if test $ac_cv_header_X11_extensions_XScreenSaver_h = yes; then have_sgi=yes ! cat >>confdefs.h <<\_ACEOF #define HAVE_SGI_SAVER_EXTENSION 1 _ACEOF --- 7576,7582 ---- echo "${ECHO_T}$ac_cv_header_X11_extensions_XScreenSaver_h" >&6 if test $ac_cv_header_X11_extensions_XScreenSaver_h = yes; then have_sgi=yes ! cat >>confdefs.h <<\_ACEOF #define HAVE_SGI_SAVER_EXTENSION 1 _ACEOF *************** *** 8665,8676 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XScreenSaverRegister (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 7740,7745 ---- *************** *** 8751,8762 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XScreenSaverRegister (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 7820,7825 ---- *************** *** 8840,8851 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XScreenSaverRegister (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 7903,7908 ---- *************** *** 8890,8896 **** fi if test "$have_mit" = yes; then ! cat >>confdefs.h <<\_ACEOF #define HAVE_MIT_SAVER_EXTENSION 1 _ACEOF --- 7947,7955 ---- fi if test "$have_mit" = yes; then ! ! ! cat >>confdefs.h <<\_ACEOF #define HAVE_MIT_SAVER_EXTENSION 1 _ACEOF *************** *** 8968,8973 **** --- 8027,8034 ---- if test "$with_xidle" = yes; then + + ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" *************** *** 9009,9015 **** echo "${ECHO_T}$ac_cv_header_X11_extensions_xidle_h" >&6 if test $ac_cv_header_X11_extensions_xidle_h = yes; then have_xidle=yes ! cat >>confdefs.h <<\_ACEOF #define HAVE_XIDLE_EXTENSION 1 _ACEOF --- 8070,8076 ---- echo "${ECHO_T}$ac_cv_header_X11_extensions_xidle_h" >&6 if test $ac_cv_header_X11_extensions_xidle_h = yes; then have_xidle=yes ! cat >>confdefs.h <<\_ACEOF #define HAVE_XIDLE_EXTENSION 1 _ACEOF *************** *** 9173,9184 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XSGIvcQueryGammaMap (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 8234,8239 ---- *************** *** 9224,9229 **** --- 8279,8286 ---- # if that succeeded, then we've really got it. if test "$have_sgivc" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_SGI_VC_EXTENSION 1 _ACEOF *************** *** 9388,9399 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char DPMSInfo (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 8445,8450 ---- *************** *** 9473,9484 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char DPMSInfo (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 8524,8529 ---- *************** *** 9526,9531 **** --- 8571,8578 ---- # if that succeeded, then we've really got it. if test "$have_dpms" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_DPMS_EXTENSION 1 _ACEOF *************** *** 9690,9701 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XineramaQueryExtension (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 8737,8742 ---- *************** *** 9775,9786 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XineramaQueryExtension (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 8816,8821 ---- *************** *** 9827,9832 **** --- 8862,8869 ---- # if that succeeded, then we've really got it. if test "$have_xinerama" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_XINERAMA 1 _ACEOF *************** *** 9989,10000 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XF86VidModeGetViewPort (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 9026,9031 ---- *************** *** 10040,10045 **** --- 9071,9078 ---- # if that succeeded, then we've really got it. if test "$have_xf86vmode" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_XF86VMODE 1 _ACEOF *************** *** 10207,10218 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XF86VidModeSetGamma (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 9240,9245 ---- *************** *** 10294,10305 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XF86VidModeSetGammaRamp (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 9321,9326 ---- *************** *** 10345,10350 **** --- 9366,9373 ---- # if those tests succeeded, then we've really got the functions. if test "$have_xf86gamma" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_XF86VMODE_GAMMA 1 _ACEOF *************** *** 10352,10357 **** --- 9375,9382 ---- fi if test "$have_xf86gamma_ramp" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_XF86VMODE_GAMMA_RAMP 1 _ACEOF *************** *** 10376,10381 **** --- 9401,9409 ---- ############################################################################### + + + ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" *************** *** 10388,10394 **** _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "XHPDisableReset" >/dev/null 2>&1; then cat >>confdefs.h <<\_ACEOF #define HAVE_XHPDISABLERESET 1 _ACEOF --- 9416,9422 ---- _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "XHPDisableReset" >/dev/null 2>&1; then cat >>confdefs.h <<\_ACEOF #define HAVE_XHPDISABLERESET 1 _ACEOF *************** *** 10435,10440 **** --- 9463,9470 ---- have_proc_interrupts=$ac_cv_have_proc_interrupts if test "$have_proc_interrupts" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_PROC_INTERRUPTS 1 _ACEOF *************** *** 10463,10468 **** --- 9493,9500 ---- if test "$enable_locking" = yes; then true elif test "$enable_locking" = no; then + + cat >>confdefs.h <<\_ACEOF #define NO_LOCKING 1 _ACEOF *************** *** 10605,10616 **** #line $LINENO "configure" #include "confdefs.h" #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 9637,9642 ---- *************** *** 10644,10649 **** --- 9670,9677 ---- echo "${ECHO_T}$ac_cv_pam" >&6 if test "$ac_cv_pam" = yes ; then have_pam=yes + + cat >>confdefs.h <<\_ACEOF #define HAVE_PAM 1 _ACEOF *************** *** 10670,10681 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 9698,9703 ---- *************** *** 10723,10734 **** #include #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 9745,9750 ---- *************** *** 10760,10771 **** #include #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 9776,9781 ---- *************** *** 10804,10809 **** --- 9814,9821 ---- echo "$as_me:$LINENO: result: one argument" >&5 echo "${ECHO_T}one argument" >&6 elif test "$ac_pam_strerror_args" = 2 ; then + + cat >>confdefs.h <<\_ACEOF #define PAM_STRERROR_TWO_ARGS 1 _ACEOF *************** *** 10898,10909 **** #line $LINENO "configure" #include "confdefs.h" #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 9910,9915 ---- *************** *** 10950,10961 **** #line $LINENO "configure" #include "confdefs.h" #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 9956,9961 ---- *************** *** 10990,10995 **** --- 9990,9997 ---- if test "$ac_cv_kerberos" = yes ; then have_kerberos=yes + + cat >>confdefs.h <<\_ACEOF #define HAVE_KERBEROS 1 _ACEOF *************** *** 10999,11008 **** --- 10001,10014 ---- if test "$ac_cv_kerberos5" = yes ; then have_kerberos=yes have_kerberos5=yes + + cat >>confdefs.h <<\_ACEOF #define HAVE_KERBEROS 1 _ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_KERBEROS5 1 _ACEOF *************** *** 11039,11050 **** char res_search (); char (*f) (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10045,10050 ---- *************** *** 11104,11115 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char res_search (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10104,10109 ---- *************** *** 11253,11264 **** #include #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10247,10252 ---- *************** *** 11326,11337 **** #include #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10314,10319 ---- *************** *** 11395,11406 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getprpwnam (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10377,10382 ---- *************** *** 11453,11464 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getprpwnam (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10429,10434 ---- *************** *** 11526,11537 **** #include #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10496,10501 ---- *************** *** 11588,11599 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char bigcrypt (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10552,10557 ---- *************** *** 11691,11702 **** #include #include #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10649,10654 ---- *************** *** 11753,11764 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getspnam (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10705,10710 ---- *************** *** 11813,11824 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getspnam (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10759,10764 ---- *************** *** 11887,11898 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char crypt (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10827,10832 ---- *************** *** 11947,11958 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char crypt (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 10881,10886 ---- *************** *** 12006,12026 **** --- 10934,10965 ---- if test "$have_shadow_adjunct" = yes ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_ADJUNCT_PASSWD 1 _ACEOF + elif test "$have_shadow_enhanced" = yes ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_ENHANCED_PASSWD 1 _ACEOF + elif test "$have_shadow_hpux" = yes ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_HPUX_PASSWD 1 _ACEOF + elif test "$have_shadow" = yes ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_SHADOW_PASSWD 1 _ACEOF *************** *** 12098,12103 **** --- 11037,11044 ---- if test "$with_motif" = yes; then have_motif=no + + ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" *************** *** 12141,12147 **** echo "${ECHO_T}$ac_cv_header_Xm_Xm_h" >&6 if test $ac_cv_header_Xm_Xm_h = yes; then have_motif=yes ! cat >>confdefs.h <<\_ACEOF #define HAVE_MOTIF 1 _ACEOF --- 11082,11088 ---- echo "${ECHO_T}$ac_cv_header_Xm_Xm_h" >&6 if test $ac_cv_header_Xm_Xm_h = yes; then have_motif=yes ! cat >>confdefs.h <<\_ACEOF #define HAVE_MOTIF 1 _ACEOF *************** *** 12155,12160 **** --- 11096,11103 ---- if test "$have_motif" = yes; then + ] + ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" *************** *** 12485,12490 **** --- 11428,11435 ---- if test "$have_gtk" = yes; then have_gtk2=yes + + cat >>confdefs.h <<\_ACEOF #define HAVE_GTK2 1 _ACEOF *************** *** 12492,12498 **** else if test -n "$ac_gtk_version_string" ; then gtk2_halfassed="$ac_gtk_version_string" - gtk2_halfassed_lib="$req" fi fi --- 11437,11442 ---- *************** *** 12519,12525 **** if test "$have_gnome" = no; then pkgs="$old_pkgs" else ! cat >>confdefs.h <<\_ACEOF #define HAVE_CRAPPLET 1 _ACEOF --- 11463,11471 ---- if test "$have_gnome" = no; then pkgs="$old_pkgs" else ! ! ! cat >>confdefs.h <<\_ACEOF #define HAVE_CRAPPLET 1 _ACEOF *************** *** 12830,12835 **** --- 11776,11783 ---- # check for this function that was not in libcapplet 1.2. # (only needed in Gnome/Gtk 1.x, not Gnome/Gtk 2.x) + + ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" # ac_save_LIBS="$LIBS" *************** *** 12864,12875 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char capplet_widget_changes_are_immediate (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 11812,11817 ---- *************** *** 12914,12922 **** --- 11856,11871 ---- LDFLAGS="$ac_save_LDFLAGS" # LIBS="$ac_save_LIBS" + fi + if test -n "$pkg_config"; then + if $pkg_config gnome-desktop-2.0 ; then + have_gnome=yes + fi + fi + GNOME_DATADIR="" if test "$have_gtk" = yes; then if test -n "$pkg_config"; then *************** *** 12942,12947 **** --- 11891,11898 ---- if test "$have_gtk" = yes; then INCLUDES="$INCLUDES $ac_gtk_config_cflags" GTK_LIBS="$GTK_LIBS $ac_gtk_config_libs" + + cat >>confdefs.h <<\_ACEOF #define HAVE_GTK 1 _ACEOF *************** *** 13002,13008 **** test -n "$have_gnome_help" || have_gnome_help="no" if test "$have_gnome_help" != no; then ! have_gnome_help=yes fi fi --- 11953,11959 ---- test -n "$have_gnome_help" || have_gnome_help="no" if test "$have_gnome_help" != no; then ! have_gnome_help=yes fi fi *************** *** 13379,13390 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char zlibVersion (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 12330,12335 ---- *************** *** 13435,13440 **** --- 12380,12387 ---- have_xml=no xml_halfassed=yes + + ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" # ac_save_LIBS="$LIBS" *************** *** 13469,13480 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char xmlParseChunk (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 12416,12421 ---- *************** *** 13510,13516 **** have_xml=yes xml_halfassed=no XML_LIBS="$ac_xml_config_libs" ! cat >>confdefs.h <<\_ACEOF #define HAVE_XML 1 _ACEOF --- 12451,12457 ---- have_xml=yes xml_halfassed=no XML_LIBS="$ac_xml_config_libs" ! cat >>confdefs.h <<\_ACEOF #define HAVE_XML 1 _ACEOF *************** *** 13527,13537 **** --- 12468,12482 ---- if test "$have_xml" = yes; then INCLUDES="$INCLUDES $ac_xml_config_cflags" GTK_LIBS="$GTK_LIBS $ac_xml_config_libs" + + cat >>confdefs.h <<\_ACEOF #define HAVE_XML 1 _ACEOF if test "$have_old_xml" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_OLD_XML_HEADERS 1 _ACEOF *************** *** 13565,13576 **** #line $LINENO "configure" #include "confdefs.h" #include - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 12510,12515 ---- *************** *** 13663,13669 **** ac_cv_lesstif_version=unknown ac_cv_lesstif_version_string=unknown fi ! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi CPPFLAGS="$ac_save_CPPFLAGS" fi --- 12602,12608 ---- ac_cv_lesstif_version=unknown ac_cv_lesstif_version_string=unknown fi ! rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi CPPFLAGS="$ac_save_CPPFLAGS" fi *************** *** 13730,13736 **** ac_cv_motif_version=unknown ac_cv_motif_version_string=unknown fi ! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi CPPFLAGS="$ac_save_CPPFLAGS" fi --- 12669,12675 ---- ac_cv_motif_version=unknown ac_cv_motif_version_string=unknown fi ! rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi CPPFLAGS="$ac_save_CPPFLAGS" fi *************** *** 13822,13833 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XpQueryExtension (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 12761,12766 ---- *************** *** 13915,13926 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char _Xsetlocale (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 12848,12853 ---- *************** *** 14093,14099 **** 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 --- 13020,13026 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 14228,14234 **** _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "Mesa|MESA" >/dev/null 2>&1; then ac_cv_have_mesa_gl=yes fi rm -f conftest* --- 13155,13161 ---- _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "Mesa|MESA" >/dev/null 2>&1; then ac_cv_have_mesa_gl=yes fi rm -f conftest* *************** *** 14268,14279 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char pthread_create (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 13195,13200 ---- *************** *** 14353,14364 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char glXCreateContext (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 13274,13279 ---- *************** *** 14437,14448 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char glXCreateContext (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 13352,13357 ---- *************** *** 14492,14503 **** gl_halfassed=yes else # linking works -- we can build the GL hacks. cat >>confdefs.h <<\_ACEOF #define HAVE_GL 1 _ACEOF if test "$ac_have_mesa_gl" = yes ; then ! cat >>confdefs.h <<\_ACEOF #define HAVE_MESA_GL 1 _ACEOF --- 13401,13416 ---- gl_halfassed=yes else # linking works -- we can build the GL hacks. + + cat >>confdefs.h <<\_ACEOF #define HAVE_GL 1 _ACEOF if test "$ac_have_mesa_gl" = yes ; then ! ! ! cat >>confdefs.h <<\_ACEOF #define HAVE_MESA_GL 1 _ACEOF *************** *** 14521,14527 **** echo $ECHO_N "(cached) $ECHO_C" >&6 else cat > conftest.$ac_ext < #ifndef MESA_MAJOR_VERSION --- 13434,13440 ---- echo $ECHO_N "(cached) $ECHO_C" >&6 else cat > conftest.$ac_ext < #ifndef MESA_MAJOR_VERSION *************** *** 14577,14582 **** --- 13490,13497 ---- # Check for OpenGL 1.1 features. # + + ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" # ac_save_LIBS="$LIBS" *************** *** 14612,14623 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char glBindTexture (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 13527,13532 ---- *************** *** 14737,14743 **** if test "$have_gl" = no ; then true ! elif test "$with_gle" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" --- 13646,13652 ---- if test "$have_gl" = no ; then true ! elif test "$with_gle" = yes; then ac_save_CPPFLAGS="$CPPFLAGS" *************** *** 14928,14939 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gleCreateGC (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 13837,13842 ---- *************** *** 15026,15037 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char uview_direction (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 13929,13934 ---- *************** *** 15109,15120 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char uview_direction_d (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 14006,14011 ---- *************** *** 15159,15169 **** --- 14050,14064 ---- fi if test "$have_gle" = yes ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_GLE 1 _ACEOF if test "$have_gle3" = yes ; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_GLE3 1 _ACEOF *************** *** 15243,15248 **** --- 14138,14145 ---- if test "$with_xpm" = yes; then + + ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" *************** *** 15284,15290 **** echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 if test $ac_cv_header_X11_xpm_h = yes; then have_xpm=yes ! cat >>confdefs.h <<\_ACEOF #define HAVE_XPM 1 _ACEOF --- 14181,14187 ---- echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 if test $ac_cv_header_X11_xpm_h = yes; then have_xpm=yes ! cat >>confdefs.h <<\_ACEOF #define HAVE_XPM 1 _ACEOF *************** *** 15627,15633 **** 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 --- 14524,14530 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 15745,15751 **** 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 --- 14642,14648 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 15864,15870 **** 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 --- 14761,14767 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 15968,15979 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gdk_pixbuf_new_from_file (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 14865,14870 ---- *************** *** 16051,16062 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gdk_pixbuf_xlib_init (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 14942,14947 ---- *************** *** 16103,16108 **** --- 14988,14995 ---- if test "$have_gdk_pixbuf" = yes; then INCLUDES="$INCLUDES $ac_gdk_pixbuf_config_cflags" XPM_LIBS="$ac_gdk_pixbuf_config_libs" + + cat >>confdefs.h <<\_ACEOF #define HAVE_GDK_PIXBUF 1 _ACEOF *************** *** 16118,16124 **** # Check for -ljpeg # ############################################################################### - have_jpeg=no with_jpeg_req=unspecified jpeg_halfassed=no --- 15005,15010 ---- *************** *** 16176,16188 **** esac ! if test "$with_jpeg" != yes -a "$with_jpeg" != no ; then echo "error: must be yes or no: --with-jpeg=$with_jpeg" exit 1 fi if test "$with_jpeg" = yes; then - have_jpeg=no ac_save_CPPFLAGS="$CPPFLAGS" --- 15062,15073 ---- esac ! if test "$with_jpeg" != yes -a "$with_jpeg" != no; then echo "error: must be yes or no: --with-jpeg=$with_jpeg" exit 1 fi if test "$with_jpeg" = yes; then have_jpeg=no ac_save_CPPFLAGS="$CPPFLAGS" *************** *** 16241,16247 **** 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 --- 15126,15132 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 16303,16308 **** --- 15188,15195 ---- have_jpeg=no jpeg_halfassed=yes + + ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" # ac_save_LIBS="$LIBS" *************** *** 16337,16348 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char jpeg_start_compress (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 15224,15229 ---- *************** *** 16378,16384 **** have_jpeg=yes jpeg_halfassed=no JPEG_LIBS="-ljpeg" ! cat >>confdefs.h <<\_ACEOF #define HAVE_JPEGLIB 1 _ACEOF --- 15259,15265 ---- have_jpeg=yes jpeg_halfassed=no JPEG_LIBS="-ljpeg" ! cat >>confdefs.h <<\_ACEOF #define HAVE_JPEGLIB 1 _ACEOF *************** *** 16564,16570 **** 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 --- 15445,15451 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 16682,16688 **** 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 --- 15563,15569 ---- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 16785,16796 **** /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XShmQueryExtension (); - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" - # endif - int F77_DUMMY_MAIN() { return 1; } - #endif int main () { --- 15666,15671 ---- *************** *** 16838,16843 **** --- 15713,15720 ---- # if that succeeded, then we've really got it. if test "$have_xshm" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_XSHM_EXTENSION 1 _ACEOF *************** *** 16961,16966 **** --- 15838,15845 ---- CPPFLAGS="$ac_save_CPPFLAGS" if test "$have_xdbe" = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_DOUBLE_BUFFER_EXTENSION 1 _ACEOF *************** *** 17041,17046 **** --- 15920,15927 ---- if test "$with_readdisplay" = yes; then + + ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then CPPFLAGS="$CPPFLAGS -I$includedir" *************** *** 17215,17222 **** ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! as_dummy=""/usr/games"" ! for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. --- 16096,16102 ---- ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in "/usr/games" do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. *************** *** 17316,17327 **** unset ac_cv_path_fortune_tmp unset fortune_tmp cat >>confdefs.h <<_ACEOF #define FORTUNE_PROGRAM "$ac_cv_fortune_program" _ACEOF - ############################################################################### # # Check whether it's ok to install some hacks as setuid (e.g., "sonar") --- 16196,16208 ---- unset ac_cv_path_fortune_tmp unset fortune_tmp + + cat >>confdefs.h <<_ACEOF #define FORTUNE_PROGRAM "$ac_cv_fortune_program" _ACEOF ############################################################################### # # Check whether it's ok to install some hacks as setuid (e.g., "sonar") *************** *** 17533,17539 **** GLADE_DATADIR='' fi - # Set PO_DATADIR to something sensible. # echo "$as_me:$LINENO: checking for locale directory" >&5 --- 16414,16419 ---- *************** *** 17571,17577 **** echo "$as_me:$LINENO: result: $PO_DATADIR/locale" >&5 echo "${ECHO_T}$PO_DATADIR/locale" >&6 - # canonicalize slashes. HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'` --- 16451,16456 ---- *************** *** 17585,17591 **** # INCLUDES=`echo "$INCLUDES" | sed 's@ -I${prefix}/include@@g;'` - ############################################################################### # # Perform substitutions and write Makefiles. --- 16464,16469 ---- *************** *** 17649,17655 **** ! ac_config_files="$ac_config_files Makefile utils/Makefile driver/Makefile hacks/Makefile hacks/glx/Makefile po/Makefile.in driver/XScreenSaver.ad driver/xscreensaver.kss" 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 --- 16527,16533 ---- ! ac_config_files="$ac_config_files Makefile utils/Makefile driver/Makefile hacks/Makefile hacks/glx/Makefile po/Makefile.in driver/XScreenSaver.ad driver/xscreensaver.kss" 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 *************** *** 17660,17666 **** # 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 # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. --- 16538,16544 ---- # 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 overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. *************** *** 17726,17735 **** DEFS=-DHAVE_CONFIG_H mv -f po/POTFILES po/POTFILES.tmp ! sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp --- 16604,16628 ---- 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 ! sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES rm -f po/POTFILES.tmp *************** *** 17751,17757 **** _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## --- 16644,16649 ---- *************** *** 17760,17770 **** if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: 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 --- 16652,16664 ---- 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 # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset *************** *** 17772,17805 **** 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; } # Name of the executable. ! as_me=`(basename "$0") 2>/dev/null || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ --- 16666,16704 ---- as_unset=false fi ! ! # 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_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES 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=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ *************** *** 17810,17815 **** --- 16709,16715 ---- /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' *************** *** 17823,17829 **** echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh ! if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: --- 16723,16729 ---- echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh ! if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: *************** *** 17877,17882 **** --- 16777,16784 ---- 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+"$@"} *************** *** 17950,17955 **** --- 16852,16863 ---- 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. *************** *** 17966,17972 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 --- 16874,16880 ---- IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH exec 6>&1 *************** *** 17983,17989 **** cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS --- 16891,16897 ---- cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.54. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS *************** *** 18045,18051 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --- 16953,16959 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.54, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 *************** *** 18066,18082 **** --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ! shift ! set dummy "$ac_option" "$ac_optarg" ${1+"$@"} ! shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. ac_need_defaults=false;; esac ! case $1 in # Handling of the options. _ACEOF cat >>$CONFIG_STATUS <<_ACEOF --- 16974,16993 ---- --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ! 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 $ac_option in # Handling of the options. _ACEOF cat >>$CONFIG_STATUS <<_ACEOF *************** *** 18099,18110 **** --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) ! shift ! CONFIG_FILES="$CONFIG_FILES $1" ac_need_defaults=false;; --header | --heade | --head | --hea ) ! shift ! CONFIG_HEADERS="$CONFIG_HEADERS $1" ac_need_defaults=false;; # This is an error. --- 17010,17021 ---- --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) ! $ac_shift ! CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) ! $ac_shift ! CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; # This is an error. *************** *** 18252,18257 **** --- 17163,17169 ---- s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@SET_MAKE@,$SET_MAKE,;t t + s,@EGREP@,$EGREP,;t t s,@PERL@,$PERL,;t t s,@X_CFLAGS@,$X_CFLAGS,;t t s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t *************** *** 18260,18281 **** 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_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 s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t s,@INTLTOOL_PERL@,$INTLTOOL_PERL,;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,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t s,@GMSGFMT@,$GMSGFMT,;t t --- 17172,17194 ---- 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 s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t + s,@INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t 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 s,@INTLTOOL_PERL@,$INTLTOOL_PERL,;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 *************** *** 18285,18293 **** 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,@POFILES@,$POFILES,;t t s,@POSUB@,$POSUB,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t --- 17198,17206 ---- s,@DATADIRNAME@,$DATADIRNAME,;t t s,@GMOFILES@,$GMOFILES,;t t s,@INSTOBJEXT@,$INSTOBJEXT,;t t s,@INTLLIBS@,$INTLLIBS,;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 *************** *** 18349,18354 **** --- 17262,17269 ---- s,@DEPEND@,$DEPEND,;t t s,@DEPEND_FLAGS@,$DEPEND_FLAGS,;t t s,@DEPEND_DEFINES@,$DEPEND_DEFINES,;t t + s,@LIBOBJS@,$LIBOBJS,;t t + s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF *************** *** 18419,18443 **** /^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; } ac_builddir=. --- 17334,17363 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { 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=. *************** *** 18467,18473 **** # 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_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` --- 17387,17393 ---- # 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_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` *************** *** 18657,18663 **** # 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 there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail --- 17577,17583 ---- # 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 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 *************** *** 18681,18687 **** mv conftest.tail conftest.defines done rm -f conftest.defines ! echo ' fi # egrep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size --- 17601,17607 ---- mv conftest.tail conftest.defines done rm -f conftest.defines ! echo ' fi # grep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size *************** *** 18737,18761 **** /^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; } rm -f $ac_file mv $tmp/config.h $ac_file --- 17657,17686 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { 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 *************** *** 18814,18820 **** # 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_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` --- 17739,17745 ---- # 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_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` diff -crN ./xscreensaver/install-sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/install-sh *** ./xscreensaver/install-sh Wed Nov 20 22:28:55 1996 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/install-sh Thu Dec 18 23:39:38 2003 *************** *** 1,4 **** ! #! /bin/sh # # install - install a program, script, or datafile # This comes from X11R5 (mit/util/scripts/install.sh). --- 1,4 ---- ! #!/bin/sh # # install - install a program, script, or datafile # This comes from X11R5 (mit/util/scripts/install.sh). *************** *** 118,123 **** --- 118,124 ---- if [ -d $dst ]; then instcmd=: + chmodcmd="" else instcmd=mkdir fi *************** *** 195,201 **** if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else --- 196,202 ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst || true; else true ; fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else *************** *** 236,242 **** if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && # Now rename the file to the real destination. --- 237,243 ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp || true; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && # Now rename the file to the real destination. diff -crN ./xscreensaver/intltool-extract.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/intltool-extract.in *** ./xscreensaver/intltool-extract.in Tue Apr 30 12:34:59 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/intltool-extract.in Thu Dec 18 23:38:06 2003 *************** *** 4,10 **** # # The Intltool Message Extractor # ! # Copyright (C) 2000-2001 Free Software Foundation. # # Intltool is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as --- 4,10 ---- # # The Intltool Message Extractor # ! # Copyright (C) 2000-2001, 2003 Free Software Foundation. # # Intltool is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as *************** *** 32,38 **** ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; ! my $VERSION = "0.18"; ## Loaded modules use strict; --- 32,38 ---- ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; ! my $VERSION = "0.27.2"; ## Loaded modules use strict; *************** *** 124,158 **** ## Sub for printing release information sub version{ ! print "${PROGRAM} (${PACKAGE}) $VERSION\n"; ! print "Copyright (C) 2000 Free Software Foundation, Inc.\n"; ! print "Written by Kenneth Christiansen, 2000.\n\n"; ! print "This is free software; see the source for copying conditions. There is NO\n"; ! print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; exit; } ## Sub for printing usage information ! sub help{ ! print "Usage: ${PROGRAM} [FILENAME] [OPTIONS] ...\n"; ! print "Generates a header file from an xml source file.\n\nGrabs all strings "; ! print "between <_translatable_node> and it's end tag,\nwhere tag are all allowed "; ! print "xml tags. Read the docs for more info.\n\n"; ! print " -v, --version shows the version\n"; ! print " -h, --help shows this help page\n"; ! print " -q, --quiet quiet mode\n"; ! print "\nReport bugs to .\n"; exit; } ## Sub for printing error messages sub error{ ! print "Try `${PROGRAM} --help' for more information.\n"; exit; } sub message { ! print "Generating C format header file for translation.\n"; } sub extract { --- 124,175 ---- ## Sub for printing release information sub version{ ! print <<_EOF_; ! ${PROGRAM} (${PACKAGE}) $VERSION ! Copyright (C) 2000, 2003 Free Software Foundation, Inc. ! Written by Kenneth Christiansen, 2000. ! ! This is free software; see the source for copying conditions. There is NO ! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! _EOF_ exit; } ## Sub for printing usage information ! sub help { ! print <<_EOF_; ! Usage: ${PROGRAM} [OPTION]... [FILENAME] ! Generates a header file from an XML source file. ! ! It grabs all strings between <_translatable_node> and its end tag in ! XML files. Read manpage (man ${PROGRAM}) for more info. ! ! --type=TYPE Specify the file type of FILENAME. Currently supports: ! "gettext/glade", "gettext/ini", "gettext/keys" ! "gettext/rfc822deb", "gettext/schemas", ! "gettext/scheme", "gettext/xml" ! -l, --local Writes output into current working directory ! (conflicts with --update) ! --update Writes output into the same directory the source file ! reside (conflicts with --local) ! -v, --version Output version information and exit ! -h, --help Display this help and exit ! -q, --quiet Quiet mode ! ! Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") ! or send email to . ! _EOF_ exit; } ## Sub for printing error messages sub error{ ! print STDERR "Try `${PROGRAM} --help' for more information.\n"; exit; } sub message { ! print "Generating C format header file for translation.\n" unless $QUIET_ARG; } sub extract { *************** *** 182,187 **** --- 199,206 ---- &type_xml if $gettext_type eq "xml"; &type_glade if $gettext_type eq "glade"; &type_scheme if $gettext_type eq "scheme"; + &type_schemas if $gettext_type eq "schemas"; + &type_rfc822deb if $gettext_type eq "rfc822deb"; } sub entity_decode_minimal *************** *** 240,258 **** sub type_xml { ### For generic translatable XML files ### ! while ($input =~ /\s_$w+=\"([^"]+)\"/sg) { # " $messages{entity_decode_minimal($1)} = []; } ! while ($input =~ /<_($w+)>(.+?)<\/_\1>/sg) { ! $_ = $2; s/\s+/ /g; - s/^ //; - s/ $//; $messages{entity_decode_minimal($_)} = []; } } sub type_glade { ### For translatable Glade XML files ### --- 259,353 ---- sub type_xml { ### For generic translatable XML files ### ! while ($input =~ /\s_$w+\s*=\s*\"([^"]+)\"/sg) { # " $messages{entity_decode_minimal($1)} = []; } ! while ($input =~ /<_($w+)(?: xml:space="($w+)")?>(.+?)<\/_\1>/sg) { ! $_ = $3; ! if (!defined($2) || $2 ne "preserve") { ! s/\s+/ /g; ! s/^ //; ! s/ $//; ! } ! $messages{entity_decode_minimal($_)} = []; ! } ! } ! ! sub type_schemas { ! ### For schemas XML files ### ! ! # FIXME: We should handle escaped < (less than) ! while ($input =~ / ! \s* ! (\s*(.*?)\s*<\/default>\s*)? ! (\s*(.*?)\s*<\/short>\s*)? ! (\s*(.*?)\s*<\/long>\s*)? ! <\/locale> ! /sgx) { ! my @totranslate = ($2,$4,$6); ! foreach (@totranslate) { ! next if !$_; s/\s+/ /g; $messages{entity_decode_minimal($_)} = []; + } } } + sub type_rfc822deb { + ### For rfc822-style Debian configuration files ### + + while ($input =~ /(?:^|\n)_[^:]+:\s*(.*?)(?=\n\S|$)/sg) { + my @str_list = rfc822deb_split($1); + for my $str (@str_list) { + # As rfc822deb is for configuration files, duplicates + # should never happen. Developers must use the + # [] construct to make msgid unique, see also intltool-merge + print STDERR "Warning: msgid multiply defined:\n $str\n" + if defined($messages{$str}); + $messages{$str} = []; + } + } + } + + sub rfc822deb_split { + # Debian defines a special way to deal with rfc822-style files: + # when a value contain newlines, it consists of + # 1. a short form (first line) + # 2. a long description, all lines begin with a space, + # and paragraphs are separated by a single dot on a line + # This routine returns an array of all paragraphs, and reformat + # them. + my $text = shift; + $text =~ s/^ //mg; + return ($text) if $text !~ /\n/; + + $text =~ s/([^\n]*)\n//; + my @list = ($1); + my $str = ''; + for my $line (split (/\n/, $text)) { + chomp $line; + $line =~ /\s+$/; + if ($line =~ /^\.$/) { + # New paragraph + $str =~ s/\s*$//; + push(@list, $str); + $str = ''; + } elsif ($line =~ /^\s/) { + # Line which must not be reformatted + $str .= "\n" if length ($str) && $str !~ /\n$/; + $str .= $line."\n"; + } else { + # Continuation line, remove newline + $str .= " " if length ($str) && $str !~ /[\n ]$/; + $str .= $line; + } + } + $str =~ s/\s*$//; + push(@list, $str) if length ($str); + return @list; + } + sub type_glade { ### For translatable Glade XML files ### *************** *** 275,285 **** while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"[^>]*>([^<]+)<\/\1>/sg) { $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/; } ! } sub type_scheme { ! while ($input =~ /_\(?"((?:[^"\\]+|\\.)*)"\)?/sg) { $messages{$1} = []; } } --- 370,382 ---- while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"[^>]*>([^<]+)<\/\1>/sg) { $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/; } ! while ($input =~ /]*)"\s+description="([^>]+)"\/>/sg) { ! $messages{entity_decode_minimal($2)} = []; ! } } sub type_scheme { ! while ($input =~ /_\w*\(?"((?:[^"\\]+|\\.)*)"\)?/sg) { $messages{$1} = []; } } *************** *** 288,294 **** for my $message (sort keys %messages) { print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/; ! my @lines = split (/\n/, $message); for (my $n = 0; $n < @lines; $n++) { if ($n == 0) { print OUT "char *s = N_(\""; --- 385,391 ---- for my $message (sort keys %messages) { print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/; ! my @lines = split (/\n/, $message, -1); for (my $n = 0; $n < @lines; $n++) { if ($n == 0) { print OUT "char *s = N_(\""; diff -crN ./xscreensaver/intltool-merge.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/intltool-merge.in *** ./xscreensaver/intltool-merge.in Tue Apr 30 12:34:59 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/intltool-merge.in Thu Dec 18 23:38:06 2003 *************** *** 3,9 **** # # The Intltool Message Merger # ! # Copyright (C) 2000, 2002 Free Software Foundation. # Copyright (C) 2000, 2001 Eazel, Inc # # Intltool is free software; you can redistribute it and/or --- 3,9 ---- # # The Intltool Message Merger # ! # Copyright (C) 2000, 2003 Free Software Foundation. # Copyright (C) 2000, 2001 Eazel, Inc # # Intltool is free software; you can redistribute it and/or *************** *** 34,44 **** ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; ! my $VERSION = "0.18"; ## Loaded modules use strict; use Getopt::Long; ## Scalars used by the option stuff my $HELP_ARG = 0; --- 34,45 ---- ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; ! my $VERSION = "0.27.2"; ## Loaded modules use strict; use Getopt::Long; + use Text::Wrap; ## Scalars used by the option stuff my $HELP_ARG = 0; *************** *** 47,52 **** --- 48,55 ---- my $XML_STYLE_ARG = 0; my $KEYS_STYLE_ARG = 0; my $DESKTOP_STYLE_ARG = 0; + my $SCHEMAS_STYLE_ARG = 0; + my $RFC822DEB_STYLE_ARG = 0; my $QUIET_ARG = 0; my $PASS_THROUGH_ARG = 0; my $UTF8_ARG = 0; *************** *** 63,68 **** --- 66,73 ---- "xml-style|x" => \$XML_STYLE_ARG, "keys-style|k" => \$KEYS_STYLE_ARG, "desktop-style|d" => \$DESKTOP_STYLE_ARG, + "schemas-style|s" => \$SCHEMAS_STYLE_ARG, + "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, "pass-through|p" => \$PASS_THROUGH_ARG, "utf8|u" => \$UTF8_ARG, "cache|c=s" => \$cache_file *************** *** 74,79 **** --- 79,85 ---- my %po_files_by_lang = (); my %translations = (); + my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv"; # Use this instead of \w for XML files to handle more possible characters. my $w = "[-A-Za-z0-9._:]"; *************** *** 83,115 **** ## Check for options. ! if ($VERSION_ARG) { &print_version; ! } elsif ($HELP_ARG) { &print_help; ! } elsif ($BA_STYLE_ARG && @ARGV > 2) { &preparation; &print_message; &ba_merge_translations; &finalize; ! } elsif ($XML_STYLE_ARG && @ARGV > 2) { &utf8_sanity_check; &preparation; &print_message; &xml_merge_translations; &finalize; ! } elsif ($KEYS_STYLE_ARG && @ARGV > 2) { &utf8_sanity_check; &preparation; &print_message; &keys_merge_translations; &finalize; ! } elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) { &preparation; &print_message; &desktop_merge_translations; &finalize; ! } else { &print_help; } --- 89,148 ---- ## Check for options. ! if ($VERSION_ARG) ! { &print_version; ! } ! elsif ($HELP_ARG) ! { &print_help; ! } ! elsif ($BA_STYLE_ARG && @ARGV > 2) ! { &preparation; &print_message; &ba_merge_translations; &finalize; ! } ! elsif ($XML_STYLE_ARG && @ARGV > 2) ! { &utf8_sanity_check; &preparation; &print_message; &xml_merge_translations; &finalize; ! } ! elsif ($KEYS_STYLE_ARG && @ARGV > 2) ! { &utf8_sanity_check; &preparation; &print_message; &keys_merge_translations; &finalize; ! } ! elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) ! { &preparation; &print_message; &desktop_merge_translations; &finalize; ! } ! elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) ! { ! &preparation; ! &print_message; ! &schemas_merge_translations; ! &finalize; ! } ! elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2) ! { ! &preparation; ! &print_message; ! &rfc822deb_merge_translations; ! &finalize; ! } ! else ! { &print_help; } *************** *** 118,150 **** ## Sub for printing release information sub print_version { ! print "${PROGRAM} (${PACKAGE}) ${VERSION}\n"; ! print "Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.\n\n"; ! print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n"; ! print "Copyright (C) 2000-2001 Eazel, Inc.\n"; ! print "This is free software; see the source for copying conditions. There is NO\n"; ! print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; exit; } ## Sub for printing usage information sub print_help { ! print "Usage: ${PROGRAM} [OPTIONS] PO_DIRECTORY FILENAME OUTPUT_FILE\n"; ! print "Generates an output file that includes translated versions of some attributes,\n"; ! print "from an untranslated source and a po directory that includes translations.\n\n"; ! print " -b, --ba-style includes translations in the bonobo-activation style\n"; ! print " -d, --desktop-style includes translations in the desktop style\n"; ! print " -k, --keys-style includes translations in the keys style\n"; ! print " -x, --xml-style includes translations in the standard xml style\n"; ! print " -u, --utf8 convert all strings to UTF-8 before merging\n"; ! print " -p, --pass-through use strings as found in .po files, without\n"; ! print " conversion (STRONGLY unrecommended with -x)\n"; ! print " -q, --quiet suppress most messages\n"; ! print " --help display this help and exit\n"; ! print " --version output version information and exit\n"; ! print "\nReport bugs to bugzilla.gnome.org, module intltool, or contact us through \n"; ! print ".\n"; exit; } --- 151,197 ---- ## Sub for printing release information sub print_version { ! print <<_EOF_; ! ${PROGRAM} (${PACKAGE}) ${VERSION} ! Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen. ! ! Copyright (C) 2000-2003 Free Software Foundation, Inc. ! Copyright (C) 2000-2001 Eazel, Inc. ! This is free software; see the source for copying conditions. There is NO ! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! _EOF_ exit; } ## Sub for printing usage information sub print_help { ! print <<_EOF_; ! Usage: ${PROGRAM} [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE ! Generates an output file that includes some localized attributes from an ! untranslated source file. ! ! Mandatory options: (exactly one must be specified) ! -b, --ba-style includes translations in the bonobo-activation style ! -d, --desktop-style includes translations in the desktop style ! -k, --keys-style includes translations in the keys style ! -s, --schemas-style includes translations in the schemas style ! -r, --rfc822deb-style includes translations in the RFC822 style ! -x, --xml-style includes translations in the standard xml style ! ! Other options: ! -u, --utf8 convert all strings to UTF-8 before merging ! -p, --pass-through use strings as found in .po files, without ! conversion (STRONGLY unrecommended with -x) ! -c, --cache=FILE specify cache file name ! (usually \$top_builddir/po/.intltool-merge-cache) ! -q, --quiet suppress most messages ! --help display this help and exit ! --version output version information and exit ! ! Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") ! or send email to . ! _EOF_ exit; } *************** *** 152,158 **** ## Sub for printing error messages sub print_error { ! print "Try `${PROGRAM} --help' for more information.\n"; exit; } --- 199,205 ---- ## Sub for printing error messages sub print_error { ! print STDERR "Try `${PROGRAM} --help' for more information.\n"; exit; } *************** *** 189,220 **** } } sub get_po_encoding { my ($in_po_file) = @_; my $encoding = ""; open IN_PO_FILE, $in_po_file or die; ! while () { ## example: "Content-Type: text/plain; charset=ISO-8859-1\n" ! if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) { $encoding = $1; last; } } close IN_PO_FILE; ! if (!$encoding) { ! print "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n"; $encoding = "ISO-8859-1"; } return $encoding } sub utf8_sanity_check { ! if (!$UTF8_ARG) { ! if (!$PASS_THROUGH_ARG) { $PASS_THROUGH_ARG="1"; } } --- 236,301 ---- } } + sub get_local_charset + { + my ($encoding) = @_; + my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/opt/freeware/lib/charset.alias"; + + # seek character encoding aliases in charset.alias (glib) + + if (open CHARSET_ALIAS, $alias_file) + { + while () + { + next if /^\#/; + return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i) + } + + close CHARSET_ALIAS; + } + + # if not found, return input string + + return $encoding; + } + sub get_po_encoding { my ($in_po_file) = @_; my $encoding = ""; open IN_PO_FILE, $in_po_file or die; ! while () ! { ## example: "Content-Type: text/plain; charset=ISO-8859-1\n" ! if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) ! { $encoding = $1; last; } } close IN_PO_FILE; ! if (!$encoding) ! { ! print STDERR "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n" unless $QUIET_ARG; $encoding = "ISO-8859-1"; } + + system ("$iconv -f $encoding -t UTF-8 /dev/null"); + if ($?) { + $encoding = get_local_charset($encoding); + } + return $encoding } sub utf8_sanity_check { ! if (!$UTF8_ARG) ! { ! if (!$PASS_THROUGH_ARG) ! { $PASS_THROUGH_ARG="1"; } } *************** *** 233,243 **** { my $newest_age; ! foreach my $file (values %po_files_by_lang) { my $file_age = -M $file; $newest_age = $file_age if !$newest_age || $file_age < $newest_age; } return $newest_age; } --- 314,327 ---- { my $newest_age; ! foreach my $file (values %po_files_by_lang) ! { my $file_age = -M $file; $newest_age = $file_age if !$newest_age || $file_age < $newest_age; } + $newest_age = 0 if !$newest_age; + return $newest_age; } *************** *** 269,276 **** sub get_cached_translation_database { my $cache_file_age = -M $cache_file; ! if (defined $cache_file_age) { ! if ($cache_file_age <= &get_newest_po_age) { &load_cache; return; } --- 353,362 ---- sub get_cached_translation_database { my $cache_file_age = -M $cache_file; ! if (defined $cache_file_age) ! { ! if ($cache_file_age <= &get_newest_po_age) ! { &load_cache; return; } *************** *** 282,299 **** sub create_translation_database { ! for my $lang (keys %po_files_by_lang) { my $po_file = $po_files_by_lang{$lang}; ! if ($UTF8_ARG) { my $encoding = get_po_encoding ($po_file); ! if (lc $encoding eq "utf-8") { open PO_FILE, "<$po_file"; ! } else { ! my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv"; open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; } ! } else { open PO_FILE, "<$po_file"; } --- 368,394 ---- sub create_translation_database { ! for my $lang (keys %po_files_by_lang) ! { my $po_file = $po_files_by_lang{$lang}; ! if ($UTF8_ARG) ! { my $encoding = get_po_encoding ($po_file); ! ! if (lc $encoding eq "utf-8") ! { open PO_FILE, "<$po_file"; ! } ! else ! { ! print STDERR "WARNING: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;; ! open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; } ! } ! else ! { open PO_FILE, "<$po_file"; } *************** *** 302,310 **** my $inmsgstr = 0; my $msgid = ""; my $msgstr = ""; ! while () { $nextfuzzy = 1 if /^#, fuzzy/; ! if (/^msgid "((\\.|[^\\])*)"/ ) { $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; $msgid = ""; $msgstr = ""; --- 397,409 ---- my $inmsgstr = 0; my $msgid = ""; my $msgstr = ""; ! ! while () ! { $nextfuzzy = 1 if /^#, fuzzy/; ! ! if (/^msgid "((\\.|[^\\])*)"/ ) ! { $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; $msgid = ""; $msgstr = ""; *************** *** 318,329 **** $inmsgstr = 0; $nextfuzzy = 0; } ! if (/^msgstr "((\\.|[^\\])*)"/) { $msgstr = unescape_po_string($1); $inmsgstr = 1; $inmsgid = 0; } ! if (/^"((\\.|[^\\])*)"/) { $msgid .= unescape_po_string($1) if $inmsgid; $msgstr .= unescape_po_string($1) if $inmsgstr; } --- 417,432 ---- $inmsgstr = 0; $nextfuzzy = 0; } ! ! if (/^msgstr "((\\.|[^\\])*)"/) ! { $msgstr = unescape_po_string($1); $inmsgstr = 1; $inmsgid = 0; } ! ! if (/^"((\\.|[^\\])*)"/) ! { $msgid .= unescape_po_string($1) if $inmsgid; $msgstr .= unescape_po_string($1) if $inmsgstr; } *************** *** 342,347 **** --- 445,451 ---- return "\\" if $sequence eq "\\\\"; return "\"" if $sequence eq "\\\""; + return "\n" if $sequence eq "\\n"; # gettext also handles \n, \t, \b, \r, \f, \v, \a, \xxx (octal), # \xXX (hex) and has a comment saying they want to handle \u and \U. *************** *** 358,363 **** --- 462,469 ---- return $string; } + ## NOTE: deal with < - < but not > - > because it seems its ok to have + ## > in the entity. For further info please look at #84738. sub entity_decode { local ($_) = @_; *************** *** 365,373 **** --- 471,485 ---- s/'/'/g; # ' s/"/"/g; # " s/&/&/g; + s/</ 127 || $_ == 34 || $_ == 38 || $_ == 39) { # the ($_ > 127) should probably be removed return "&#" . $_ . ";"; ! } else { return chr $_; } } --- 503,521 ---- return """ if $_ == 34; return "&" if $_ == 38; return "'" if $_ == 39; + return "<" if $_ == 60; return chr $_; } sub entity_encode_int_even_high_bit { ! if ($_ > 127 || $_ == 34 || $_ == 38 || $_ == 39 || $_ == 60) ! { # the ($_ > 127) should probably be removed return "&#" . $_ . ";"; ! } ! else ! { return chr $_; } } *************** *** 424,430 **** open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!"; ! while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) { print OUTPUT $1; my $node = $2 . "\n"; --- 544,551 ---- open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!"; ! while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) ! { print OUTPUT $1; my $node = $2 . "\n"; *************** *** 437,449 **** print OUTPUT; my %langs; ! for my $string (@strings) { ! for my $lang (keys %po_files_by_lang) { $langs{$lang} = 1 if $translations{$lang, $string}; } } ! for my $lang (sort keys %langs) { $_ = $node; s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s; s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg; --- 558,573 ---- print OUTPUT; my %langs; ! for my $string (@strings) ! { ! for my $lang (keys %po_files_by_lang) ! { $langs{$lang} = 1 if $translations{$lang, $string}; } } ! for my $lang (sort keys %langs) ! { $_ = $node; s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s; s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg; *************** *** 479,485 **** $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; # Support for <_foo>blah style translations. ! while ($source =~ s|^(.*?)([ \t]*)<\s*_($w+)\s*>(.*?)<\s*/_\3\s*>([ \t]*\n)?||s) { print OUTPUT $1; my $spaces = $2; --- 603,610 ---- $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; # Support for <_foo>blah style translations. ! while ($source =~ s|^(.*?)([ \t]*)<\s*_($w+)\s*>(.*?)<\s*/_\3\s*>([ \t]*\n)?||s) ! { print OUTPUT $1; my $spaces = $2; *************** *** 493,499 **** $string =~ s/ $//; $string = entity_decode($string); ! for my $lang (sort keys %po_files_by_lang) { my $translation = $translations{$lang, $string}; next if !$translation; $translation = entity_encode($translation); --- 618,625 ---- $string =~ s/ $//; $string = entity_decode($string); ! for my $lang (sort keys %po_files_by_lang) ! { my $translation = $translations{$lang, $string}; next if !$translation; $translation = entity_encode($translation); *************** *** 511,525 **** open INPUT, "<${FILE}" or die; open OUTPUT, ">${OUTFILE}" or die; ! while () { ! if (s/^(\s*)_(\w+=(.*))/$1$2/) { my $string = $3; print OUTPUT; my $non_translated_line = $_; ! for my $lang (sort keys %po_files_by_lang) { my $translation = $translations{$lang, $string}; next if !$translation; --- 637,654 ---- open INPUT, "<${FILE}" or die; open OUTPUT, ">${OUTFILE}" or die; ! while () ! { ! if (s/^(\s*)_(\w+=(.*))/$1$2/) ! { my $string = $3; print OUTPUT; my $non_translated_line = $_; ! for my $lang (sort keys %po_files_by_lang) ! { my $translation = $translations{$lang, $string}; next if !$translation; *************** *** 527,533 **** s/(\w+)=.*/[$lang]$1=$translation/; print OUTPUT; } ! } else { print OUTPUT; } } --- 656,664 ---- s/(\w+)=.*/[$lang]$1=$translation/; print OUTPUT; } ! } ! else ! { print OUTPUT; } } *************** *** 541,555 **** open INPUT, "<${FILE}" or die; open OUTPUT, ">${OUTFILE}" or die; ! while () { ! if (s/^(\s*)_(\w+=(.*))/$1$2/) { my $string = $3; print OUTPUT; my $non_translated_line = $_; ! for my $lang (sort keys %po_files_by_lang) { my $translation = $translations{$lang, $string}; next if !$translation; --- 672,689 ---- open INPUT, "<${FILE}" or die; open OUTPUT, ">${OUTFILE}" or die; ! while () ! { ! if (s/^(\s*)_(\w+=(.*))/$1$2/) ! { my $string = $3; print OUTPUT; my $non_translated_line = $_; ! for my $lang (sort keys %po_files_by_lang) ! { my $translation = $translations{$lang, $string}; next if !$translation; *************** *** 557,563 **** s/(\w+)=.*/${1}[$lang]=$translation/; print OUTPUT; } ! } else { print OUTPUT; } } --- 691,699 ---- s/(\w+)=.*/${1}[$lang]=$translation/; print OUTPUT; } ! } ! else ! { print OUTPUT; } } *************** *** 565,567 **** --- 701,933 ---- close OUTPUT; close INPUT; } + + sub schemas_merge_translations + { + my $source; + + { + local $/; # slurp mode + open INPUT, "<$FILE" or die "can't open $FILE: $!"; + $source = ; + close INPUT; + } + + open OUTPUT, ">$OUTFILE" or die; + + # FIXME: support attribute translations + + # Empty nodes never need translation, so unmark all of them. + # For example, <_foo/> is just replaced by . + $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; + + while ($source =~ s/ + (.*?) + (\s+)((\s*) + (\s*(.*?)\s*<\/default>)?(\s*) + (\s*(.*?)\s*<\/short>)?(\s*) + (\s*(.*?)\s*<\/long>)?(\s*) + <\/locale>) + //sx) + { + print OUTPUT $1; + + my $locale_start_spaces = $2 ? $2 : ''; + my $default_spaces = $4 ? $4 : ''; + my $short_spaces = $7 ? $7 : ''; + my $long_spaces = $10 ? $10 : ''; + my $locale_end_spaces = $13 ? $13 : ''; + my $c_default_block = $3 ? $3 : ''; + my $default_string = $6 ? $6 : ''; + my $short_string = $9 ? $9 : ''; + my $long_string = $12 ? $12 : ''; + + $c_default_block =~ s/default>\[.*?\]/default>/s; + + print OUTPUT "$locale_start_spaces$c_default_block"; + + $default_string =~ s/\s+/ /g; + $default_string = entity_decode($default_string); + $short_string =~ s/\s+/ /g; + $short_string = entity_decode($short_string); + $long_string =~ s/\s+/ /g; + $long_string = entity_decode($long_string); + + for my $lang (sort keys %po_files_by_lang) + { + my $default_translation = $translations{$lang, $default_string}; + my $short_translation = $translations{$lang, $short_string}; + my $long_translation = $translations{$lang, $long_string}; + + next if (!$default_translation && !$short_translation && + !$long_translation); + + print OUTPUT "\n$locale_start_spaces"; + + print OUTPUT "$default_spaces"; + + if ($default_translation) + { + $default_translation = entity_encode($default_translation); + print OUTPUT "$default_translation"; + } + + print OUTPUT "$short_spaces"; + + if ($short_translation) + { + $short_translation = entity_encode($short_translation); + print OUTPUT "$short_translation"; + } + + print OUTPUT "$long_spaces"; + + if ($long_translation) + { + $long_translation = entity_encode($long_translation); + print OUTPUT "$long_translation"; + } + + print OUTPUT "$locale_end_spaces"; + } + } + + print OUTPUT $source; + + close OUTPUT; + } + + sub rfc822deb_merge_translations + { + my $source; + + $Text::Wrap::huge = 'overflow'; + + { + local $/; # slurp mode + open INPUT, "<$FILE" or die "can't open $FILE: $!"; + $source = ; + close INPUT; + } + + open OUTPUT, ">${OUTFILE}" or die; + + while ($source =~ /(^|\n+)(_)?([^:_\n]+)(:\s*)(.*?)(?=\n[\S\n]|$)/sg) + { + my $sep = $1; + my $non_translated_line = $3.$4; + my $string = $5; + my $is_translatable = defined($2); + # Remove [] dummy strings + $string =~ s/\[\s[^\[\]]*\]$//; + $non_translated_line .= $string; + + print OUTPUT $sep.$non_translated_line; + + if ($is_translatable) + { + my @str_list = rfc822deb_split($string); + + for my $lang (sort keys %po_files_by_lang) + { + my $is_translated = 1; + my $str_translated = ''; + my $first = 1; + + for my $str (@str_list) + { + my $translation = $translations{$lang, $str}; + + if (!$translation) + { + $is_translated = 0; + last; + } + + # $translation may also contain [] dummy + # strings, mostly to indicate an empty string + $translation =~ s/\[\s[^\[\]]*\]$//; + + if ($first) + { + $str_translated .= + Text::Tabs::expand($translation) . + "\n"; + } + else + { + $str_translated .= Text::Tabs::expand( + Text::Wrap::wrap(' ', ' ', $translation)) . + "\n .\n"; + } + $first = 0; + + # To fix some problems with Text::Wrap::wrap + $str_translated =~ s/(\n )+\n/\n .\n/g; + } + next unless $is_translated; + + $str_translated =~ s/\n \.\n$//; + $str_translated =~ s/\s+$//; + + $_ = $non_translated_line; + s/^(\w+):\s*.*/$sep${1}-$lang: $str_translated/s; + print OUTPUT; + } + } + } + print OUTPUT "\n"; + + close OUTPUT; + close INPUT; + } + + sub rfc822deb_split + { + # Debian defines a special way to deal with rfc822-style files: + # when a value contain newlines, it consists of + # 1. a short form (first line) + # 2. a long description, all lines begin with a space, + # and paragraphs are separated by a single dot on a line + # This routine returns an array of all paragraphs, and reformat + # them. + my $text = shift; + $text =~ s/^ //mg; + return ($text) if $text !~ /\n/; + + $text =~ s/([^\n]*)\n//; + my @list = ($1); + my $str = ''; + + for my $line (split (/\n/, $text)) + { + chomp $line; + $line =~ /\s+$/; + + if ($line =~ /^\.$/) + { + # New paragraph + $str =~ s/\s*$//; + push(@list, $str); + $str = ''; + } + elsif ($line =~ /^\s/) + { + # Line which must not be reformatted + $str .= "\n" if length ($str) && $str !~ /\n$/; + $str .= $line."\n"; + } + else + { + # Continuation line, remove newline + $str .= " " if length ($str) && $str !~ /[\n ]$/; + $str .= $line; + } + } + + $str =~ s/\s*$//; + push(@list, $str) if length ($str); + + return @list; + } + diff -crN ./xscreensaver/intltool-update.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/intltool-update.in *** ./xscreensaver/intltool-update.in Tue Apr 30 12:34:59 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/intltool-update.in Thu Dec 18 23:38:06 2003 *************** *** 3,9 **** # # The Intltool Message Updater # ! # Copyright (C) 2000-2002 Free Software Foundation. # # Intltool is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License --- 3,9 ---- # # The Intltool Message Updater # ! # Copyright (C) 2000-2003 Free Software Foundation. # # Intltool is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License *************** *** 29,35 **** ## Release information my $PROGRAM = "intltool-update"; ! my $VERSION = "0.18"; my $PACKAGE = "intltool"; ## Loaded modules --- 29,35 ---- ## Release information my $PROGRAM = "intltool-update"; ! my $VERSION = "0.27.2"; my $PACKAGE = "intltool"; ## Loaded modules *************** *** 49,56 **** --- 49,58 ---- my $REPORT_ARG = 0; my $VERBOSE = 0; my $GETTEXT_PACKAGE = ""; + my $OUTPUT_FILE = ""; my @languages; + my %varhash = (); my %po_files_by_lang = (); # Regular expressions to categorize file types. *************** *** 59,69 **** --- 61,74 ---- my $xml_extension = "xml(\.in)*|". # .in is not required "ui|". + "lang|". "glade2?(\.in)*|". # .in is not required "scm(\.in)*|". # .in is not required "oaf(\.in)+|". "etspec|". + "server(\.in)+|". "sheet(\.in)+|". + "schemas(\.in)+|". "pong(\.in)+"; my $ini_extension = *************** *** 72,80 **** "directory(\.in)+|". "soundlist(\.in)+|". "keys(\.in)+|". ! "server(\.in)+"; ! ## Always print as the first thing $| = 1; ## Handle options --- 77,85 ---- "directory(\.in)+|". "soundlist(\.in)+|". "keys(\.in)+|". ! "theme(\.in)+"; ! ## Always flush buffer when printing $| = 1; ## Handle options *************** *** 89,94 **** --- 94,100 ---- "report|r" => \$REPORT_ARG, "verbose|x" => \$VERBOSE, "gettext-package|g=s" => \$GETTEXT_PACKAGE, + "output-file|o=s" => \$OUTPUT_FILE, ) or &print_error_invalid_option; &print_help if $HELP_ARG; *************** *** 99,131 **** + ($HEADERS_ARG > 0) + ($MAINTAIN_ARG > 0) + ($REPORT_ARG > 0); &print_help if $arg_count > 1; # --version and --help don't require a module name my $MODULE = $GETTEXT_PACKAGE || &find_package_name; ! if ($DIST_ARG) { ! if ($ARGV[0] =~ /^[a-z]/){ ! &update_po_file ($ARGV[0]); ! &print_status ($ARGV[0]); ! } else { ! &print_help; ! } ! } elsif ($POT_ARG) { &generate_headers; &generate_po_template; ! } elsif ($HEADERS_ARG) { &generate_headers; ! } elsif ($MAINTAIN_ARG) { &find_leftout_files; ! } elsif ($REPORT_ARG) { &print_report; ! } else { ! if ($ARGV[0] =~ /^[a-z]/) { ! &main ($ARGV[0]); ! } else { ! &print_help; ! } } exit; --- 105,155 ---- + ($HEADERS_ARG > 0) + ($MAINTAIN_ARG > 0) + ($REPORT_ARG > 0); + &print_help if $arg_count > 1; # --version and --help don't require a module name my $MODULE = $GETTEXT_PACKAGE || &find_package_name; ! if ($POT_ARG) ! { &generate_headers; &generate_po_template; ! } ! elsif ($HEADERS_ARG) ! { &generate_headers; ! } ! elsif ($MAINTAIN_ARG) ! { &find_leftout_files; ! } ! elsif ($REPORT_ARG) ! { ! &generate_headers; ! &generate_po_template; &print_report; ! } ! elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/) ! { ! my $lang = $ARGV[0]; ! ! ## Report error if the language file supplied ! ## to the command line is non-existent ! &print_error_not_existing("$lang.po") if ! -s "$lang.po"; ! ! if (!$DIST_ARG) ! { ! print "Working, please wait..." if $VERBOSE; ! &generate_headers; ! &generate_po_template; ! } ! &update_po_file ($lang, $OUTPUT_FILE); ! &print_status ($lang, $OUTPUT_FILE); ! } ! else ! { ! &print_help; } exit; *************** *** 134,222 **** sub print_version { ! ## Print version information ! print "${PROGRAM} (${PACKAGE}) $VERSION\n"; ! print "Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.\n\n"; ! print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n"; ! print "This is free software; see the source for copying conditions. There is NO\n"; ! print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; exit; } sub print_help { ! ## Print usage information ! print "Usage: ${PROGRAM} [OPTIONS] ...LANGCODE\n"; ! print "Updates PO template files and merge them with the translations.\n\n"; ! print " -p, --pot generate the PO template only\n"; ! print " -s, --headers generate the header files in POTFILES.in\n"; ! print " -m, --maintain search for left out files from POTFILES.in\n"; ! print " -r, --report display a status report for the module.\n"; ! print " -x, --verbose display lots of feedback\n"; ! print " --help display this help and exit\n"; ! print " --version output version information and exit\n"; ! print "\nExamples of use:\n"; ! print "${PROGRAM} --pot just creates a new PO template from the source\n"; ! print "${PROGRAM} da created new PO template and updated the da.po file\n\n"; ! print "Report bugs to bugzilla.gnome.org, module 'intltool'.\n"; exit; } - sub main - { - my ($lang) = @_; - - ## Report error if the language file supplied - ## to the command line is non-existent - &print_error_not_existing("$lang.po") if ! -s "$lang.po"; - - print "Working, please wait..." unless $VERBOSE; - &generate_headers; - &generate_po_template; - &update_po_file ($lang); - &print_status ($lang); - } - sub determine_type ($) { my $type = $_; my $gettext_type; ! # FIXME: Use $xml_extentions, and maybe do all this even nicer my $xml_regex = ! "(?:xml(\.in)*|ui|oaf(?:\.in)+|server(?:\.in)+|sheet(?:\.in)+|". ! "pong(?:\.in)+|etspec)"; my $ini_regex = ! "(?:desktop(?:\.in)+|caves(?:\.in)+|directory(?:\.in)+|". "soundlist(?:\.in)+)"; ! if ($type =~ /\[type: gettext\/([^\]].*)]/) { ! $gettext_type=$1; } ! elsif ($type =~ /$xml_regex$/) { ! $gettext_type="xml"; } ! elsif ($type =~ /glade2?(\.in)*$/) { ! $gettext_type="glade"; } ! elsif ($type =~ /$ini_regex$/) { ! $gettext_type="ini"; } ! elsif ($type =~ /scm(\.in)*$/) { ! $gettext_type="scheme"; } ! elsif ($type =~ /keys(\.in)+$/) { ! $gettext_type="keys"; } - else { $gettext_type=""; } return "gettext\/$gettext_type"; } sub find_leftout_files { my (@buf_i18n_plain, @buf_i18n_xml, @buf_i18n_ini, @buf_potfiles, @buf_potfiles_ignore, --- 158,279 ---- sub print_version { ! print <<_EOF_; ! ${PROGRAM} (${PACKAGE}) $VERSION ! Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler. ! ! Copyright (C) 2000-2003 Free Software Foundation, Inc. ! This is free software; see the source for copying conditions. There is NO ! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! _EOF_ exit; } sub print_help { ! print <<_EOF_; ! Usage: ${PROGRAM} [OPTION]... LANGCODE ! Updates PO template files and merge them with the translations. ! ! Mode of operation (only one is allowed): ! -p, --pot generate the PO template only ! -s, --headers generate the header files in POTFILES.in ! -m, --maintain search for left out files from POTFILES.in ! -r, --report display a status report for the module ! -d, --dist merge LANGCODE.po with existing PO template ! ! Extra options: ! -g, --gettext-package=NAME override PO template name, useful with --pot ! -o, --output-file=FILE write merged translation to FILE ! -x, --verbose display lots of feedback ! --help display this help and exit ! --version output version information and exit ! ! Examples of use: ! ${PROGRAM} --pot just create a new PO template ! ${PROGRAM} xy create new PO template and merge xy.po with it ! ! Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") ! or send email to . ! _EOF_ exit; } sub determine_type ($) { my $type = $_; my $gettext_type; ! # FIXME: Use $xml_extension, and maybe do all this even nicer my $xml_regex = ! "(?:xml(\.in)*|ui|lang|oaf(?:\.in)+|server(?:\.in)+|sheet(?:\.in)+|". ! "pong(?:\.in)+|etspec|schemas(?:\.in)+)"; my $ini_regex = ! "(?:desktop(?:\.in)+|theme(?:\.in)+|caves(?:\.in)+|directory(?:\.in)+|". "soundlist(?:\.in)+)"; ! if ($type =~ /\[type: gettext\/([^\]].*)]/) ! { ! $gettext_type=$1; ! } ! elsif ($type =~ /schemas(\.in)+$/) ! { ! $gettext_type="schemas"; ! } ! elsif ($type =~ /$xml_regex$/) ! { ! $gettext_type="xml"; } ! elsif ($type =~ /glade2?(\.in)*$/) ! { ! $gettext_type="glade"; } ! elsif ($type =~ /$ini_regex$/) ! { ! $gettext_type="ini"; } ! elsif ($type =~ /scm(\.in)*$/) ! { ! $gettext_type="scheme"; } ! elsif ($type =~ /keys(\.in)+$/) ! { ! $gettext_type="keys"; } ! else ! { ! $gettext_type=""; } return "gettext\/$gettext_type"; } + sub determine_code ($) + { + my $gettext_code="ASCII"; # All files are ASCII by default + my $filetype=`file $_ | cut -d ' ' -f 2`; + + if ($? eq "0") + { + if ($filetype =~ /^(ISO|UTF)/) + { + chomp ($gettext_code = $filetype); + } + elsif ($filetype =~ /^XML/) + { + $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8 + } + } + + return $gettext_code; + } + + sub find_leftout_files { my (@buf_i18n_plain, @buf_i18n_xml, + @buf_i18n_xml_unmarked, @buf_i18n_ini, @buf_potfiles, @buf_potfiles_ignore, *************** *** 227,388 **** ## Search and find all translatable files find sub { ! push @buf_i18n_plain, "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|h|gob)$/ ! }, ".."; ! find sub { ! push @buf_i18n_xml, "$File::Find::name" if /\.($xml_extension)$/ ! }, ".."; ! find sub { ! push @buf_i18n_ini, "$File::Find::name" if /\.($ini_extension)$/ }, ".."; - open POTFILES, "POTFILES.in" || die "$PROGRAM: there's no POTFILES.in!\n"; ! @buf_potfiles = grep /^[^#]/, ; ! print "Searching for missing translatable files...\n" if $VERBOSE; ## Check if we should ignore some found files, when ## comparing with POTFILES.in ! foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") { ! if (-s $ignore) { ! open FILE, $ignore; ! while () { ! if (/^[^#]/){ ! push @buf_potfiles_ignore, $_; ! } ! } ! print "Found $ignore: Ignoring files...\n" if $VERBOSE; ! @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles); ! } } foreach my $file (@buf_i18n_plain) ! { ! my $in_comment = 0; my $in_macro = 0; ! open FILE, "<$file"; ! while () ! { # Handle continued multi-line comment. if ($in_comment) ! { next unless s-.*\*/--; $in_comment = 0; ! } # Handle continued macro. if ($in_macro) ! { $in_macro = 0 unless /\\$/; next; ! } # Handle start of macro (or any preprocessor directive). if (/^\s*\#/) ! { $in_macro = 1 if /^([^\\]|\\.)*\\$/; next; ! } # Handle comments and quoted text. while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy ! { my $match = $1; if ($match eq "/*") ! { if (!s-/\*.*?\*/--) ! { s-/\*.*--; $in_comment = 1; ! } ! } elsif ($match eq "//") ! { s-//.*--; ! } else # ' or " ! { if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) ! { warn "mismatched quotes at line $. in $file\n"; s-$match.*--; ! } ! } ! } ! if (/_\(QUOTEDTEXT/) ! { ## Remove the first 3 chars and add newline push @buf_allfiles, unpack("x3 A*", $file) . "\n"; last; ! } ! } close FILE; ! } ! foreach my $file (@buf_i18n_xml) { ! open FILE, "<$file"; ! while () { ! if (/\s_(.*)=\"/){ ! push @buf_allfiles, unpack("x3 A*", $file) . "\n"; ! last; ! } ! } ! } ! ! foreach my $file (@buf_i18n_ini){ ! open FILE, "<$file"; ! while () { ! if (/_(.*)=/){ ! push @buf_allfiles, unpack("x3 A*", $file) . "\n"; ! last; ! } ! } } @buf_allfiles_sorted = sort (@buf_allfiles); @buf_potfiles_sorted = sort (@buf_potfiles); my %in2; ! foreach (@buf_potfiles_sorted) { ! $in2{$_} = 1; } my @result; ! foreach (@buf_allfiles_sorted){ ! if (!exists($in2{$_})){ ! push @result, $_ ! } } ## Save file with information about the files missing ## if any, and give information about this procedure. ! if (@result) { ! print "\n" if $VERBOSE; ! open OUT, ">missing"; ! print OUT @result; ! print "The following files contain translations and are currently not in use. Please\n"; ! print "consider adding these to the POTFILES.in file, located in the po/ directory.\n\n"; ! print @result, "\n"; ! print "If some of these files are left out on purpose then please add them to\n"; ! print "POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list\n"; ! print "of left out files has been written in the current directory.\n"; } ## If there is nothing to complain about, notify the user else { ! print "\nAll files containing translations are present in POTFILES.in.\n"; } } sub print_error_invalid_option { ## Handle invalid arguments ! print "Try `${PROGRAM} --help' for more information.\n"; exit 1; } --- 284,503 ---- ## Search and find all translatable files find sub { ! push @buf_i18n_plain, "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|h|gob)$/; ! push @buf_i18n_xml, "$File::Find::name" if /\.($xml_extension)$/; ! push @buf_i18n_ini, "$File::Find::name" if /\.($ini_extension)$/; ! push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; }, ".."; ! open POTFILES, "; ! close POTFILES; ! ! foreach (@buf_potfiles) { ! s/^\[.*]\s*//; ! } ! print "Searching for missing translatable files...\n" if $VERBOSE; ## Check if we should ignore some found files, when ## comparing with POTFILES.in ! foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") ! { ! (-s $ignore) or next; ! ! if ("$ignore" eq "POTFILES.ignore") ! { ! print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n". ! "content of this file to POTFILES.skip.\n"; ! } ! ! print "Found $ignore: Ignoring files...\n" if $VERBOSE; ! open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n"; ! ! while () ! { ! push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/; ! } ! close FILE; ! ! @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles); } foreach my $file (@buf_i18n_plain) ! { ! my $in_comment = 0; my $in_macro = 0; ! open FILE, "<$file"; ! while () ! { # Handle continued multi-line comment. if ($in_comment) ! { next unless s-.*\*/--; $in_comment = 0; ! } # Handle continued macro. if ($in_macro) ! { $in_macro = 0 unless /\\$/; next; ! } # Handle start of macro (or any preprocessor directive). if (/^\s*\#/) ! { $in_macro = 1 if /^([^\\]|\\.)*\\$/; next; ! } # Handle comments and quoted text. while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy ! { my $match = $1; if ($match eq "/*") ! { if (!s-/\*.*?\*/--) ! { s-/\*.*--; $in_comment = 1; ! } ! } elsif ($match eq "//") ! { s-//.*--; ! } else # ' or " ! { if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) ! { warn "mismatched quotes at line $. in $file\n"; s-$match.*--; ! } ! } ! } if (/_\(QUOTEDTEXT/) ! { ## Remove the first 3 chars and add newline push @buf_allfiles, unpack("x3 A*", $file) . "\n"; last; ! } ! } close FILE; ! } ! foreach my $file (@buf_i18n_xml) ! { ! open FILE, "<$file"; ! ! while () ! { ! # FIXME: share the pattern matching code with intltool-extract ! if (/\s_(.*)=\"/ || /<_[^>]+>/ || /translatable=\"yes\"/) ! { ! push @buf_allfiles, unpack("x3 A*", $file) . "\n"; ! last; ! } ! } ! close FILE; ! } ! ! foreach my $file (@buf_i18n_ini) ! { ! open FILE, "<$file"; ! while () ! { ! if (/_(.*)=/) ! { ! push @buf_allfiles, unpack("x3 A*", $file) . "\n"; ! last; ! } ! } ! close FILE; ! } ! ! foreach my $file (@buf_i18n_xml_unmarked) ! { ! push @buf_allfiles, unpack("x3 A*", $file) . "\n"; } + @buf_allfiles_sorted = sort (@buf_allfiles); @buf_potfiles_sorted = sort (@buf_potfiles); my %in2; ! foreach (@buf_potfiles_sorted) ! { ! $in2{$_} = 1; } my @result; ! foreach (@buf_allfiles_sorted) ! { ! if (!exists($in2{$_})) ! { ! push @result, $_ ! } ! } ! ! my @buf_potfiles_notexist; ! ! foreach (@buf_potfiles_sorted) ! { ! chomp (my $dummy = $_); ! if ("$dummy" ne "" and ! -f "../$dummy") ! { ! push @buf_potfiles_notexist, $_; ! } } ## Save file with information about the files missing ## if any, and give information about this procedure. ! if (@result + @buf_potfiles_notexist > 0) ! { ! if (@result) ! { ! print "\n" if $VERBOSE; ! unlink "missing"; ! open OUT, ">missing"; ! print OUT @result; ! close OUT; ! warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n". ! "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n"; ! print STDERR @result, "\n"; ! warn "If some of these files are left out on purpose then please add them to\n". ! "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n". ! "of left out files has been written in the current directory.\n"; ! } ! if (@buf_potfiles_notexist) ! { ! unlink "notexist"; ! open OUT, ">notexist"; ! print OUT @buf_potfiles_notexist; ! close OUT; ! warn "\n" if ($VERBOSE or @result); ! warn "\e[1mThe following files do not exist anymore:\e[0m\n\n"; ! warn @buf_potfiles_notexist, "\n"; ! warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n". ! "containing this list of absent files has been written in the current directory.\n"; ! } } ## If there is nothing to complain about, notify the user else { ! print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE; } } sub print_error_invalid_option { ## Handle invalid arguments ! print STDERR "Try `${PROGRAM} --help' for more information.\n"; exit 1; } *************** *** 395,498 **** ## Generate the .h header files, so we can allow glade and ## xml translation support ! if (! -s $EXTRACT) { ! print "\n *** The intltool-extract script wasn't found!" ."\n *** Without it, intltool-update can not generate files.\n"; exit; } else { ! open FILE, ") { ! chomp; ! ## Find xml files in POTFILES.in and generate the ! ## files with help from the extract script my $gettext_type= &determine_type ($1); ! if (/\.($xml_extension|$ini_extension)$/ || /^\[/){ ! $_ =~ s/^\[[^\[].*]\s*//; ! my $filename = "../$_"; ! ! if ($VERBOSE){ ! system($EXTRACT, "--update", "--type=$gettext_type", $filename); ! } else { ! system($EXTRACT, "--update", "--type=$gettext_type", "--quiet", $filename); ! } ! } } close FILE; } } sub generate_po_template { ! ## Generate the potfiles from the POTFILES.in file ! print "Building the $MODULE.pot...\n" if $VERBOSE; ! move ("POTFILES.in", "POTFILES.in.old"); ! open INFILE, "POTFILES.in"; ! while () { ! s/\.($xml_extension|$ini_extension)$/$&.h/; ! s/^\[.*]\s*(.*)/$1.h/; ! print OUTFILE $_; } ! close OUTFILE; ! close INFILE; ! system ("xgettext", "--default-domain\=$MODULE", ! "--directory\=\.\.", ! "--add-comments", ! "--keyword\=\_", ! "--keyword\=N\_", ! "--keyword\=U\_", ! "--files-from\=\.\/POTFILES\.in"); ! ! if (!-e "$MODULE.po") { ! print "WARNING: It seems that none of the files in POTFILES.in ". ! "contain marked strings\n"; ! exit (1); } ! system ("rm", "-f", "$MODULE.pot"); ! move ("$MODULE.po", "$MODULE.pot") || die "$PROGRAM: couldn't move $MODULE.po to $MODULE.pot.\n"; ! print "Wrote $MODULE.pot\n" if $VERBOSE; ! move ("POTFILES.in.old", "POTFILES.in"); print "Removing generated header (.h) files..." if $VERBOSE; ! open FILE, ") { ! chomp; ! unlink "../$_.h" if /\.($xml_extension|$ini_extension)$/; } - - close FILE; - print "done\n" if $VERBOSE; } sub update_po_file { ! my ($lang) = @_; print "Merging $lang.po with $MODULE.pot..." if $VERBOSE; ! copy ("$lang.po", "$lang.po.old") || die "copy failed: $!"; ! # Perform merge, remove backup file and the "messages" trash file ! # generated by gettext ! system ("msgmerge", "$lang.po.old", "$MODULE.pot", "-o", "$lang.po"); ! unlink "$lang.po.old"; ! unlink "messages"; } sub print_error_not_existing --- 510,738 ---- ## Generate the .h header files, so we can allow glade and ## xml translation support ! if (! -x "$EXTRACT") { ! print STDERR "\n *** The intltool-extract script wasn't found!" ."\n *** Without it, intltool-update can not generate files.\n"; exit; } else { ! open (FILE, ") ! { ! chomp; ! next if /^\[\s*encoding/; ! ## Find xml files in POTFILES.in and generate the ! ## files with help from the extract script my $gettext_type= &determine_type ($1); ! if (/\.($xml_extension|$ini_extension)$/ || /^\[/) ! { ! s/^\[[^\[].*]\s*//; ! ! my $filename = "../$_"; ! ! if ($VERBOSE) ! { ! system ($EXTRACT, "--update", ! "--type=$gettext_type", $filename); ! } ! else ! { ! system ($EXTRACT, "--update", "--type=$gettext_type", ! "--quiet", $filename); ! } ! } } close FILE; } } + # + # Generate .pot file from POTFILES.in + # sub generate_po_template { ! my $XGETTEXT = `which xgettext 2>/dev/null`; ! chomp $XGETTEXT; ! ! $XGETTEXT = $ENV{"XGETTEXT"} if $ENV{"XGETTEXT"}; ! ! if (! -x $XGETTEXT) ! { ! print STDERR " *** xgettext is not found on this system!\n". ! " *** Without it, intltool-update can not extract strings.\n"; ! exit; ! } ! ! print "Building $MODULE.pot...\n" if $VERBOSE; ! open INFILE, "POTFILES.in.temp"; ! my $gettext_support_nonascii = 0; ! # checks for GNU gettext >= 0.12 ! # don't use argument list, since shell interpretation is desired here ! if (system("$XGETTEXT --version --from-code=UTF-8 >&/dev/null") == 0) ! { ! $gettext_support_nonascii = 1; } ! else ! { ! # urge everybody to upgrade gettext ! print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n". ! " strings. That means you should install a version of gettext\n". ! " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n". ! " or have to let non-ASCII strings untranslated.\n"; ! } ! ! my $encoding = "ASCII"; ! my $forced_gettext_code; ! my @temp_headers; ! my $encoding_problem_is_reported = 0; ! ! while () ! { ! next if (/^#/ or /^\s*$/); ! ! chomp; ! ! my $gettext_code; ! if (/^\[\s*encoding:\s*(.*)\s*\]/) ! { ! $forced_gettext_code=$1; ! } ! elsif (/\.($xml_extension|$ini_extension)$/ || /^\[/) ! { ! s/^\[.*]\s*//; ! print OUTFILE "$_.h\n"; ! push @temp_headers, "../$_.h"; ! $gettext_code = &determine_code ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code); ! } ! else ! { ! print OUTFILE "$_\n"; ! $gettext_code = &determine_code ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code); ! } ! ! next if (! $gettext_support_nonascii); ! ! if (defined $forced_gettext_code) ! { ! $encoding=$forced_gettext_code; ! } ! elsif (defined $gettext_code and "$encoding" ne "$gettext_code") ! { ! if ($encoding eq "ASCII") ! { ! $encoding=$gettext_code; ! } ! elsif ($gettext_code ne "ASCII") ! { ! # Only report once because the message is quite long ! if (! $encoding_problem_is_reported) ! { ! print STDERR "WARNING: You should use the same file encoding for all your project files,\n". ! " but $PROGRAM thinks that most of the source files are in\n". ! " $encoding encoding, while \"$_\" is (likely) in\n". ! " $gettext_code encoding. If you are sure that all translatable strings\n". ! " are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n". ! " line to POTFILES.in:\n\n". ! " [encoding: UTF-8]\n\n". ! " and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n". ! "(such warning message will only be reported once.)\n"; ! $encoding_problem_is_reported = 1; ! } ! } ! } } ! close OUTFILE; ! close INFILE; ! unlink "$MODULE.pot"; ! my @xgettext_argument=("$XGETTEXT", ! "--add-comments", ! "--directory\=\.\.", ! "--keyword\=\_", ! "--keyword\=N\_", ! "--keyword\=U\_", ! "--output\=$MODULE\.pot", ! "--files-from\=\.\/POTFILES\.in\.temp"); ! push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); ! my $xgettext_command = join ' ', @xgettext_argument; ! ! # intercept xgettext error message ! my $xgettext_error_msg = `$xgettext_command 2>\&1`; ! my $command_failed = $?; ! unlink "POTFILES.in.temp"; print "Removing generated header (.h) files..." if $VERBOSE; + unlink foreach (@temp_headers); + print "done.\n" if $VERBOSE; ! if (! $command_failed) { ! if (! -e "$MODULE.pot") ! { ! print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE; ! } ! else ! { ! print "Wrote $MODULE.pot\n" if $VERBOSE; ! } ! } ! else ! { ! if ($xgettext_error_msg =~ /--from-code/) ! { ! # replace non-ASCII error message with a more useful one. ! print STDERR "ERROR: xgettext failed to generate PO template file because there is non-ASCII\n". ! " string marked for translation. Please make sure that all strings marked\n". ! " for translation are in uniform encoding (say UTF-8), then \e[1m*prepend*\e[0m the\n". ! " following line to POTFILES.in and rerun $PROGRAM:\n\n". ! " [encoding: UTF-8]\n\n"; ! } ! else ! { ! print STDERR "$xgettext_error_msg"; ! if (-e "$MODULE.pot") ! { ! # is this possible? ! print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n". ! " Please consult error message above if there is any.\n"; ! } ! else ! { ! print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n". ! " error message above if there is any.\n"; ! } ! } ! exit (1); } } sub update_po_file { ! -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; ! ! my ($lang, $outfile) = @_; print "Merging $lang.po with $MODULE.pot..." if $VERBOSE; ! my $infile = "$lang.po"; ! $outfile = "$lang.po" if ($outfile eq ""); ! # I think msgmerge won't overwrite old file if merge is not successful ! system ("msgmerge", "-o", $outfile, $infile, "$MODULE.pot"); } sub print_error_not_existing *************** *** 500,507 **** my ($file) = @_; ## Report error if supplied language file is non-existing ! print "$PROGRAM: $file does not exist!\n"; ! print "Try '$PROGRAM --help' for more information.\n"; exit; } --- 740,747 ---- my ($file) = @_; ## Report error if supplied language file is non-existing ! print STDERR "$PROGRAM: $file does not exist!\n"; ! print STDERR "Try '$PROGRAM --help' for more information.\n"; exit; } *************** *** 511,602 **** @languages = map (&po_file2lang, @po_files); ! foreach my $lang (@languages) { $po_files_by_lang{$lang} = shift (@po_files); } } sub po_file2lang ($) { ! my $tmp = $_; ! $tmp =~ s/^.*\/(.*)\.po$/$1/; ! return $tmp; } sub print_status { ! my ($lang) = @_; ! system ("msgfmt", "--statistics", "$lang.po"); ! print "\n"; } sub print_report { - &generate_headers; - &generate_po_template; &gather_po_files; ! foreach my $lang (@languages) { print "$lang: "; ! &update_po_file ($lang); } print "\n\n * Current translation support in $MODULE \n\n"; ! foreach my $lang (@languages){ ! print "$lang: "; ! system ("msgfmt", "--statistics", "$lang.po"); } } ! sub find_package_name { my $base_dirname = getcwd(); $base_dirname =~ s@.*/@@; my ($conf_in, $src_dir); ! if ($base_dirname =~ /^po(-.+)?$/) { ! if (-f "../configure.in") { ! $conf_in = "../configure.in"; ! } else { my $makefile_source; local (*IN); open IN, ") { ! if (/^top_srcdir[ \t]*=/) { ! $src_dir = $_; ! # print "${src_dir}\n"; ! $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; ! # print "${src_dir}\n"; chomp $src_dir; $conf_in = "$src_dir" . "/configure.in" . "\n"; last; } } ! $conf_in || die "Cannot find top_srcdir in Makefile." ! } ! my $conf_source; { ! local (*IN); ! local $/; # slurp mode ! open (IN, "<$conf_in") || die "can't open $conf_in: $!"; ! $conf_source = ; ! } ! ! my $name = ""; ! $name = $1 if $conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+)/m; ! $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=(\S+)/m; ! if ($name =~ /^[\$](\S+)/) { ! return $1 if $conf_source =~ /^\s*$1=(\S*)/m; ! } ! return $name if $name; } ! print "$PROGRAM: Unable to determine package name.\n" . ! "Make sure to run this script inside the po directory.\n"; ! exit; } --- 751,923 ---- @languages = map (&po_file2lang, @po_files); ! foreach my $lang (@languages) ! { $po_files_by_lang{$lang} = shift (@po_files); } } sub po_file2lang ($) { ! s/^(.*\/)?(.+)\.po$/$2/; ! return $_; } sub print_status { ! my ($lang, $output_file) = @_; ! $output_file = "$lang.po" if ($output_file eq ""); ! ! system ("msgfmt", "-o", "/dev/null", "--statistics", $output_file); } sub print_report { &gather_po_files; ! foreach my $lang (@languages) ! { print "$lang: "; ! &update_po_file ($lang, ""); } print "\n\n * Current translation support in $MODULE \n\n"; ! foreach my $lang (@languages) ! { ! print "$lang: "; ! system ("msgfmt", "-o", "/dev/null", "--statistics", "$lang.po"); } } ! sub substitute_var ! { ! my ($str) = @_; ! ! # always need to rewind file whenever it has been accessed ! seek (CONF, 0, 0); ! ! # cache each variable. varhash is global to we can add ! # variables elsewhere. ! while () ! { ! if (/^(\w+)=(\S+)/) ! { ! $varhash{$1} = $2; ! } ! } ! ! if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ! { ! my $rest = $3; ! my $untouched = $1; ! my $sub = $varhash{$2}; ! ! return substitute_var ("$untouched$sub$rest"); ! } ! return $str; ! } ! ! sub open_CONF_handle { my $base_dirname = getcwd(); $base_dirname =~ s@.*/@@; my ($conf_in, $src_dir); ! if ($base_dirname =~ /^po(-.+)?$/) ! { ! if (-f "../configure.ac") ! { ! $conf_in = "../configure.ac"; ! } ! elsif (-f "../configure.in") ! { ! $conf_in = "../configure.in"; ! } ! else ! { my $makefile_source; + local (*IN); open IN, ") ! { ! if (/^top_srcdir[ \t]*=/) ! { ! $src_dir = $_; $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; ! chomp $src_dir; $conf_in = "$src_dir" . "/configure.in" . "\n"; + last; } } ! close IN; ! $conf_in || die "Cannot find top_srcdir in Makefile."; ! } ! ! open (CONF, "<$conf_in") || die "can't open $conf_in: $!"; ! } ! else ! { ! print STDERR "$PROGRAM: Unable to proceed.\n" . ! "Make sure to run this script inside the po directory.\n"; ! exit; } + } ! sub find_package_name ! { ! &open_CONF_handle; ! ! my $conf_source; { ! local (*IN); ! open (IN, "<&CONF") || die "can't open configure.in/configure.ac: $!"; ! seek (IN, 0, 0); ! local $/; # slurp mode ! $conf_source = ; ! close IN; ! } ! ! my $name = "untitled"; ! my $version; ! ! # priority for getting package name: ! # 1. GETTEXT_PACKAGE ! # 2. first argument of AC_INIT (with >= 2 arguments) ! # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument) ! ! # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m ! # the \s makes this not work, why? ! if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m) ! { ! ($name, $version) = ($1, $2); ! $name =~ s/[\[\]\s]//g; ! ($varhash{"AC_PACKAGE_VERSION"} = $version) =~ s/[\[\]\s]//g; ! } ! ! if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) ! { ! ($name, $version) = ($1, $2); ! $name=~ s/[\[\]\s]//g; ! $varhash{"AC_PACKAGE_NAME"} = $name; ! ($varhash{"AC_PACKAGE_VERSION"} = $version) =~ s/[\[\]\s]//g; ! } ! ! # \s makes this not work, why? ! $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m; ! ! # prepend '$' to auto* internal variables, usually they are ! # used in configure.in/ac without the '$' ! $name =~ s/AC_/\$AC_/g; ! $name =~ s/\$\$/\$/g; ! ! $name = substitute_var ($name); ! ! return $name if $name; } diff -crN ./xscreensaver/mkinstalldirs /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/mkinstalldirs *** ./xscreensaver/mkinstalldirs Thu Jan 1 01:00:00 1970 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/mkinstalldirs Thu Dec 18 23:39:38 2003 *************** *** 0 **** --- 1,111 ---- + #! /bin/sh + # mkinstalldirs --- make directory hierarchy + # Author: Noah Friedman + # Created: 1993-05-16 + # Public domain + + errstatus=0 + dirmode="" + + usage="\ + Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." + + # process command line arguments + while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" 1>&2 + exit 0 + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac + done + + for file + do + if test -d "$file"; then + shift + else + break + fi + done + + case $# in + 0) exit 0 ;; + esac + + case $dirmode in + '') + if mkdir -p -- . 2>/dev/null; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + fi + ;; + *) + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + fi + ;; + esac + + for file + do + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift + + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp="$pathcomp/" + done + done + + exit $errstatus + + # Local Variables: + # mode: shell-script + # sh-indentation: 2 + # End: + # mkinstalldirs ends here