diff -Nru pcb-20100929/aclocal.m4 pcb-20110918/aclocal.m4 --- pcb-20100929/aclocal.m4 2010-09-29 20:48:13.000000000 +0000 +++ pcb-20110918/aclocal.m4 2011-09-18 20:06:18.000000000 +0000 @@ -13,1082 +13,12 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, +[m4_warning([this file was generated for autoconf 2.66. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# codeset.m4 serial 2 (gettext-0.16) -dnl Copyright (C) 2000-2002, 2006 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 From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET); return !cs;], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) - fi -]) - -# gettext.m4 serial 60 (gettext-0.17) -dnl Copyright (C) 1995-2007 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2006. - -dnl Macro to add for using GNU gettext. - -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The -dnl default (if it is not specified or empty) is 'no-libtool'. -dnl INTLSYMBOL should be 'external' for packages with no intl directory, -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. -dnl If INTLSYMBOL is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. If NEEDSYMBOL is specified and is -dnl 'need-formatstring-macros', then GNU gettext implementations that don't -dnl support the ISO C 99 formatstring macros will be ignored. -dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_GNU_GETTEXT], -[ - dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT -])])])]) - define([gt_included_intl], - ifelse([$1], [external], - ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), - [yes])) - define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) - gt_NEEDS_INIT - AM_GNU_GETTEXT_NEED([$2]) - - AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) - - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Sometimes libintl requires libiconv, so first search for libiconv. - dnl Ideally we would do this search only after the - dnl if test "$USE_NLS" = "yes"; then - dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT - dnl the configure script would need to contain the same shell code - dnl again, outside any 'if'. There are two solutions: - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not - dnl documented, we avoid it. - ifelse(gt_included_intl, yes, , [ - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - ]) - - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. - gt_INTL_MACOSX - - dnl Set USE_NLS. - AC_REQUIRE([AM_NLS]) - - ifelse(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - ]) - LIBINTL= - LTLIBINTL= - POSUB= - - dnl Add a version number to the cache macros. - case " $gt_needs " in - *" need-formatstring-macros "*) gt_api_version=3 ;; - *" need-ngettext "*) gt_api_version=2 ;; - *) gt_api_version=1 ;; - esac - gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" - gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no - ifelse(gt_included_intl, yes, [ - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - ]) - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. - - if test $gt_api_version -ge 3; then - gt_revision_test_code=' -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -' - else - gt_revision_test_code= - fi - if test $gt_api_version -ge 2; then - gt_expression_test_code=' + * ngettext ("", "", 0)' - else - gt_expression_test_code= - fi - - AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], - [AC_TRY_LINK([#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], - [eval "$gt_func_gnugettext_libc=yes"], - [eval "$gt_func_gnugettext_libc=no"])]) - - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl Sometimes libintl requires libiconv, so first search for libiconv. - ifelse(gt_included_intl, yes, , [ - AM_ICONV_LINK - ]) - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL - dnl even if libiconv doesn't exist. - AC_LIB_LINKFLAGS_BODY([intl]) - AC_CACHE_CHECK([for GNU gettext in libintl], - [$gt_func_gnugettext_libintl], - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [eval "$gt_func_gnugettext_libintl=yes"], - [eval "$gt_func_gnugettext_libintl=no"]) - dnl Now see whether libintl exists and depends on libiconv. - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" - ]) - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - fi - - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ - || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then - gt_use_preinstalled_gnugettext=yes - else - dnl Reset the values set by searching for libintl. - LIBINTL= - LTLIBINTL= - INCINTL= - fi - - ifelse(gt_included_intl, yes, [ - if test "$gt_use_preinstalled_gnugettext" != "yes"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on included GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - - CATOBJEXT= - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions to use GNU gettext tools. - CATOBJEXT=.gmo - fi - ]) - - if test -n "$INTL_MACOSX_LIBS"; then - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Some extra flags are needed during linking. - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" - fi - fi - - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) - else - USE_NLS=no - fi - fi - - AC_MSG_CHECKING([whether to use NLS]) - AC_MSG_RESULT([$USE_NLS]) - if test "$USE_NLS" = "yes"; then - AC_MSG_CHECKING([where the gettext function comes from]) - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - gt_source="external libintl" - else - gt_source="libc" - fi - else - gt_source="included intl directory" - fi - AC_MSG_RESULT([$gt_source]) - fi - - if test "$USE_NLS" = "yes"; then - - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - AC_MSG_CHECKING([how to link with libintl]) - AC_MSG_RESULT([$LIBINTL]) - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) - fi - - dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, - [Define if the GNU dcgettext() function is already present or preinstalled.]) - fi - - dnl We need to process the po/ directory. - POSUB=po - fi - - ifelse(gt_included_intl, yes, [ - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then - BUILD_INCLUDED_LIBINTL=yes - fi - - dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) - - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share - AC_SUBST(DATADIRNAME) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST(GENCAT) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLOBJS= - if test "$USE_INCLUDED_LIBINTL" = yes; then - INTLOBJS="\$(GETTOBJS)" - fi - AC_SUBST(INTLOBJS) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) - ]) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) - - dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) -]) - - -dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. -m4_define([gt_NEEDS_INIT], -[ - m4_divert_text([DEFAULTS], [gt_needs=]) - m4_define([gt_NEEDS_INIT], []) -]) - - -dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) -AC_DEFUN([AM_GNU_GETTEXT_NEED], -[ - m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) -]) - - -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) - -# glibc2.m4 serial 1 -dnl Copyright (C) 2000-2002, 2004 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. - -# Test for the GNU C Library, version 2.0 or newer. -# From Bruno Haible. - -AC_DEFUN([gt_GLIBC2], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer, - ac_cv_gnu_library_2, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2=yes, - ac_cv_gnu_library_2=no) - ] - ) - AC_SUBST(GLIBC2) - GLIBC2="$ac_cv_gnu_library_2" - ] -) - -# glibc21.m4 serial 3 -dnl Copyright (C) 2000-2002, 2004 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. - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([gl_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) - -# iconv.m4 serial AM6 (gettext-0.17) -dnl Copyright (C) 2000-2002, 2007 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 From Bruno Haible. - -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) - -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ - dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. - am_save_LIBS="$LIBS" - if test $am_cv_lib_iconv = yes; then - LIBS="$LIBS $LIBICONV" - fi - AC_TRY_RUN([ -#include -#include -int main () -{ - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ - { - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); - if (cd_utf8_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\342\202\254"; /* EURO SIGN */ - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - return 1; - } - } -#if 0 /* This bug could be worked around by the caller. */ - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; - char buf[50]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if ((int)res > 0) - return 1; - } - } -#endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; -}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], - [case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac]) - LIBS="$am_save_LIBS" - ]) - case "$am_cv_func_iconv_works" in - *no) am_func_iconv=no am_cv_lib_iconv=no ;; - *) am_func_iconv=yes ;; - esac - else - am_func_iconv=no am_cv_lib_iconv=no - fi - if test "$am_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, - [Define if you have the iconv() function and it works.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) -]) - -AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi -]) - -# intdiv0.m4 serial 2 (gettext-0.17) -dnl Copyright (C) 2002, 2007 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 From Bruno Haible. - -AC_DEFUN([gt_INTDIV0], -[ - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - - AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], - gt_cv_int_divbyzero_sigfpe, - [ - gt_cv_int_divbyzero_sigfpe= -changequote(,)dnl - case "$host_os" in - macos* | darwin[6-9]* | darwin[1-9][0-9]*) - # On MacOS X 10.2 or newer, just assume the same as when cross- - # compiling. If we were to perform the real test, 1 Crash Report - # dialog window would pop up. - case "$host_cpu" in - i[34567]86 | x86_64) - gt_cv_int_divbyzero_sigfpe="guessing yes" ;; - esac - ;; - esac -changequote([,])dnl - if test -z "$gt_cv_int_divbyzero_sigfpe"; then - AC_TRY_RUN([ -#include -#include - -static void -sigfpe_handler (int sig) -{ - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ - exit (sig != SIGFPE); -} - -int x = 1; -int y = 0; -int z; -int nan; - -int main () -{ - signal (SIGFPE, sigfpe_handler); -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) - signal (SIGTRAP, sigfpe_handler); -#endif -/* Linux/SPARC yields signal SIGILL. */ -#if defined (__sparc__) && defined (__linux__) - signal (SIGILL, sigfpe_handler); -#endif - - z = x / y; - nan = y / y; - exit (1); -} -], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, - [ - # Guess based on the CPU. -changequote(,)dnl - case "$host_cpu" in - alpha* | i[34567]86 | x86_64 | m68k | s390*) - gt_cv_int_divbyzero_sigfpe="guessing yes";; - *) - gt_cv_int_divbyzero_sigfpe="guessing no";; - esac -changequote([,])dnl - ]) - fi - ]) - case "$gt_cv_int_divbyzero_sigfpe" in - *yes) value=1;; - *) value=0;; - esac - AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, - [Define if integer division by zero raises signal SIGFPE.]) -]) - -# intl.m4 serial 8 (gettext-0.17) -dnl Copyright (C) 1995-2007 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2006. - -AC_PREREQ(2.52) - -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], -[ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([gt_GLIBC2])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([gl_VISIBILITY])dnl - AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl - AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl - AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gt_TYPE_INTMAX_T]) - AC_REQUIRE([gt_PRINTF_POSIX]) - AC_REQUIRE([gl_GLIBC21])dnl - AC_REQUIRE([gl_XSIZE])dnl - AC_REQUIRE([gt_INTL_MACOSX])dnl - - AC_CHECK_TYPE([ptrdiff_t], , - [AC_DEFINE([ptrdiff_t], [long], - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) - ]) - AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) - AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) - - dnl Use the _snprintf function only if it is declared (because on NetBSD it - dnl is defined as a weak alias of snprintf; we prefer to use the latter). - gt_CHECK_DECL(_snprintf, [#include ]) - gt_CHECK_DECL(_snwprintf, [#include ]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(getc_unlocked, [#include ]) - - case $gt_cv_func_printf_posix in - *yes) HAVE_POSIX_PRINTF=1 ;; - *) HAVE_POSIX_PRINTF=0 ;; - esac - AC_SUBST([HAVE_POSIX_PRINTF]) - if test "$ac_cv_func_asprintf" = yes; then - HAVE_ASPRINTF=1 - else - HAVE_ASPRINTF=0 - fi - AC_SUBST([HAVE_ASPRINTF]) - if test "$ac_cv_func_snprintf" = yes; then - HAVE_SNPRINTF=1 - else - HAVE_SNPRINTF=0 - fi - AC_SUBST([HAVE_SNPRINTF]) - if test "$ac_cv_func_wprintf" = yes; then - HAVE_WPRINTF=1 - else - HAVE_WPRINTF=0 - fi - AC_SUBST([HAVE_WPRINTF]) - - AM_LANGINFO_CODESET - gt_LC_MESSAGES - - dnl Compilation on mingw and Cygwin needs special Makefile rules, because - dnl 1. when we install a shared library, we must arrange to export - dnl auxiliary pointer variables for every exported variable, - dnl 2. when we install a shared library and a static library simultaneously, - dnl the include file specifies __declspec(dllimport) and therefore we - dnl must arrange to define the auxiliary pointer variables for the - dnl exported variables _also_ in the static library. - if test "$enable_shared" = yes; then - case "$host_os" in - mingw* | cygwin*) is_woe32dll=yes ;; - *) is_woe32dll=no ;; - esac - else - is_woe32dll=no - fi - WOE32DLL=$is_woe32dll - AC_SUBST([WOE32DLL]) - - dnl On mingw and Cygwin, we can activate special Makefile rules which add - dnl version information to the shared libraries and executables. - case "$host_os" in - mingw* | cygwin*) is_woe32=yes ;; - *) is_woe32=no ;; - esac - WOE32=$is_woe32 - AC_SUBST([WOE32]) - if test $WOE32 = yes; then - dnl Check for a program that compiles Windows resource files. - AC_CHECK_TOOL([WINDRES], [windres]) - fi - - dnl Determine whether when creating a library, "-lc" should be passed to - dnl libtool or not. On many platforms, it is required for the libtool option - dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool - dnl in the *.la files - makes it impossible to create multithreaded programs, - dnl because libtool also reorders the -lc to come before the -pthread, and - dnl this disables pthread_create() . - case "$host_os" in - hpux*) LTLIBC="" ;; - *) LTLIBC="-lc" ;; - esac - AC_SUBST([LTLIBC]) - - dnl Rename some macros and functions used for locking. - AH_BOTTOM([ -#define __libc_lock_t gl_lock_t -#define __libc_lock_define gl_lock_define -#define __libc_lock_define_initialized gl_lock_define_initialized -#define __libc_lock_init gl_lock_init -#define __libc_lock_lock gl_lock_lock -#define __libc_lock_unlock gl_lock_unlock -#define __libc_lock_recursive_t gl_recursive_lock_t -#define __libc_lock_define_recursive gl_recursive_lock_define -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -#define __libc_lock_init_recursive gl_recursive_lock_init -#define __libc_lock_lock_recursive gl_recursive_lock_lock -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -#define glthread_in_use libintl_thread_in_use -#define glthread_lock_init libintl_lock_init -#define glthread_lock_lock libintl_lock_lock -#define glthread_lock_unlock libintl_lock_unlock -#define glthread_lock_destroy libintl_lock_destroy -#define glthread_rwlock_init libintl_rwlock_init -#define glthread_rwlock_rdlock libintl_rwlock_rdlock -#define glthread_rwlock_wrlock libintl_rwlock_wrlock -#define glthread_rwlock_unlock libintl_rwlock_unlock -#define glthread_rwlock_destroy libintl_rwlock_destroy -#define glthread_recursive_lock_init libintl_recursive_lock_init -#define glthread_recursive_lock_lock libintl_recursive_lock_lock -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy -#define glthread_once libintl_once -#define glthread_once_call libintl_once_call -#define glthread_once_singlethreaded libintl_once_singlethreaded -]) -]) - - -dnl Checks for the core files of the intl subdirectory: -dnl dcigettext.c -dnl eval-plural.h -dnl explodename.c -dnl finddomain.c -dnl gettextP.h -dnl gmo.h -dnl hash-string.h hash-string.c -dnl l10nflist.c -dnl libgnuintl.h.in (except the *printf stuff) -dnl loadinfo.h -dnl loadmsgcat.c -dnl localealias.c -dnl log.c -dnl plural-exp.h plural-exp.c -dnl plural.y -dnl Used by libglocale. -AC_DEFUN([gt_INTL_SUBDIR_CORE], -[ - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - AC_REQUIRE([gl_LOCK])dnl - - AC_TRY_LINK( - [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], - [], - [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, - [Define to 1 if the compiler understands __builtin_expect.])]) - - AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ - stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ - argz_next __fsetlocking]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(feof_unlocked, [#include ]) - gt_CHECK_DECL(fgets_unlocked, [#include ]) - - AM_ICONV - - dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, - dnl and a _NL_LOCALE_NAME macro always. - AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, - [AC_TRY_LINK([#include -#include ], - [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES)); - return !cs; - ], - gt_cv_nl_locale_name=yes, - gt_cv_nl_locale_name=no) - ]) - if test $gt_cv_nl_locale_name = yes; then - AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, - [Define if you have and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi -]) - - -dnl gt_CHECK_DECL(FUNC, INCLUDES) -dnl Check whether a function is declared. -AC_DEFUN([gt_CHECK_DECL], -[ - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, - [AC_TRY_COMPILE([$2], [ -#ifndef $1 - char *p = (char *) $1; -#endif -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) - if test $ac_cv_have_decl_$1 = yes; then - gt_value=1 - else - gt_value=0 - fi - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) -]) - -# intlmacosx.m4 serial 1 (gettext-0.17) -dnl Copyright (C) 2004-2007 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Checks for special options needed on MacOS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in MacOS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], - [CFPreferencesCopyAppValue(NULL, NULL)], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) -]) - dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 40 IT_PROG_INTLTOOL @@ -1240,7 +170,7 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl The following CONFIG_COMMANDS should be executed at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -1283,1602 +213,8 @@ # AC_DEFUN([AC_PROG_INTLTOOL], ...) -# intmax.m4 serial 3 (gettext-0.16) -dnl Copyright (C) 2002-2005 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 From Bruno Haible. -dnl Test whether the system has the 'intmax_t' type, but don't attempt to -dnl find a replacement if it is lacking. - -AC_DEFUN([gt_TYPE_INTMAX_T], -[ - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, - [AC_TRY_COMPILE([ -#include -#include -#if HAVE_STDINT_H_WITH_UINTMAX -#include -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -#include -#endif -], [intmax_t x = -1; - return !x;], - gt_cv_c_intmax_t=yes, - gt_cv_c_intmax_t=no)]) - if test $gt_cv_c_intmax_t = yes; then - AC_DEFINE(HAVE_INTMAX_T, 1, - [Define if you have the 'intmax_t' type in or .]) - fi -]) - -# inttypes-pri.m4 serial 4 (gettext-0.16) -dnl Copyright (C) 1997-2002, 2006 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 From Bruno Haible. - -AC_PREREQ(2.52) - -# Define PRI_MACROS_BROKEN if exists and defines the PRI* -# macros to non-string values. This is the case on AIX 4.3.3. - -AC_DEFUN([gt_INTTYPES_PRI], -[ - AC_CHECK_HEADERS([inttypes.h]) - if test $ac_cv_header_inttypes_h = yes; then - AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], - gt_cv_inttypes_pri_broken, - [ - AC_TRY_COMPILE([#include -#ifdef PRId32 -char *p = PRId32; -#endif -], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) - ]) - fi - if test "$gt_cv_inttypes_pri_broken" = yes; then - AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, - [Define if exists and defines unusable PRI* macros.]) - PRI_MACROS_BROKEN=1 - else - PRI_MACROS_BROKEN=0 - fi - AC_SUBST([PRI_MACROS_BROKEN]) -]) - -# inttypes_h.m4 serial 7 -dnl Copyright (C) 1997-2004, 2006 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 From Paul Eggert. - -# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, -# doesn't clash with , and declares uintmax_t. - -AC_DEFUN([gl_AC_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, - [AC_TRY_COMPILE( - [#include -#include ], - [uintmax_t i = (uintmax_t) -1; return !i;], - gl_cv_header_inttypes_h=yes, - gl_cv_header_inttypes_h=no)]) - if test $gl_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, - [Define if exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) - -# lcmessage.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1995-2002, 2004-2005 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995. - -# Check whether LC_MESSAGES is available in . - -AC_DEFUN([gt_LC_MESSAGES], -[ - AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)]) - if test $gt_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi -]) - -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 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 Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) - -# lib-link.m4 serial 13 (gettext-0.17) -dnl Copyright (C) 2001-2007 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 From Bruno Haible. - -AC_PREREQ(2.54) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - LIB[]NAME[]_PREFIX= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl acl_libext, -dnl acl_shlibext, -dnl acl_hardcode_libdir_flag_spec, -dnl acl_hardcode_libdir_separator, -dnl acl_hardcode_direct, -dnl acl_hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found -dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl Autoconf >= 2.61 supports dots in --with options. - define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], -[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - LIB[]NAME[]_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - dnl The same code as in the loop below: - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$acl_hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIB[]NAME[]_PREFIX="$basedir" - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -dnl For those cases where a variable contains several -L and -l options -dnl referring to unknown libraries and directories, this macro determines the -dnl necessary additional linker options for the runtime path. -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) -dnl sets LDADDVAR to linker options needed together with LIBSVALUE. -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, -dnl otherwise linking without libtool is assumed. -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -[ - AC_REQUIRE([AC_LIB_RPATH]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - $1= - if test "$enable_rpath" != no; then - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode directories into the resulting - dnl binary. - rpathdirs= - next= - for opt in $2; do - if test -n "$next"; then - dir="$next" - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then - rpathdirs="$rpathdirs $dir" - fi - next= - else - case $opt in - -L) next=yes ;; - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then - rpathdirs="$rpathdirs $dir" - fi - next= ;; - *) next= ;; - esac - fi - done - if test "X$rpathdirs" != "X"; then - if test -n ""$3""; then - dnl libtool is used for linking. Use -R options. - for dir in $rpathdirs; do - $1="${$1}${$1:+ }-R$dir" - done - else - dnl The linker is used for linking directly. - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user - dnl must pass all path elements in one option. - alldirs= - for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="$flag" - else - dnl The -rpath options are cumulative. - for dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="${$1}${$1:+ }$flag" - done - fi - fi - fi - fi - fi - AC_SUBST([$1]) -]) - -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 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 From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". -AC_DEFUN([AC_LIB_PREPARE_MULTILIB], -[ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi -]) - -# lock.m4 serial 7 (gettext-0.17) -dnl Copyright (C) 2005-2007 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 From Bruno Haible. - -dnl Tests for a multithreading library to be used. -dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS, -dnl USE_PTH_THREADS, USE_WIN32_THREADS -dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use -dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with -dnl libtool). -dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for -dnl programs that really need multithread functionality. The difference -dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak -dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread". -dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for -dnl multithread-safe programs. - -AC_DEFUN([gl_LOCK_EARLY], -[ - AC_REQUIRE([gl_LOCK_EARLY_BODY]) -]) - -dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once. - -AC_DEFUN([gl_LOCK_EARLY_BODY], -[ - dnl Ordering constraints: This macro modifies CPPFLAGS in a way that - dnl influences the result of the autoconf tests that test for *_unlocked - dnl declarations, on AIX 5 at least. Therefore it must come early. - AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl - AC_BEFORE([$0], [gl_ARGP])dnl - - AC_REQUIRE([AC_CANONICAL_HOST]) - dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems. - dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes - dnl AC_GNU_SOURCE. - m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], - [AC_REQUIRE([AC_GNU_SOURCE])]) - dnl Check for multithreading. - AC_ARG_ENABLE(threads, -AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) -AC_HELP_STRING([--disable-threads], [build without multithread safety]), - [gl_use_threads=$enableval], - [case "$host_os" in - dnl Disable multithreading by default on OSF/1, because it interferes - dnl with fork()/exec(): When msgexec is linked with -lpthread, its child - dnl process gets an endless segmentation fault inside execvp(). - osf*) gl_use_threads=no ;; - *) gl_use_threads=yes ;; - esac - ]) - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - # For using : - case "$host_os" in - osf*) - # On OSF/1, the compiler needs the flag -D_REENTRANT so that it - # groks . cc also understands the flag -pthread, but - # we don't use it because 1. gcc-2.95 doesn't understand -pthread, - # 2. putting a flag into CPPFLAGS that has an effect on the linker - # causes the AC_TRY_LINK test below to succeed unexpectedly, - # leading to wrong values of LIBTHREAD and LTLIBTHREAD. - CPPFLAGS="$CPPFLAGS -D_REENTRANT" - ;; - esac - # Some systems optimize for single-threaded programs by default, and - # need special flags to disable these optimizations. For example, the - # definition of 'errno' in . - case "$host_os" in - aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; - solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; - esac - fi -]) - -dnl The guts of gl_LOCK. Needs to be expanded only once. - -AC_DEFUN([gl_LOCK_BODY], -[ - AC_REQUIRE([gl_LOCK_EARLY_BODY]) - gl_threads_api=none - LIBTHREAD= - LTLIBTHREAD= - LIBMULTITHREAD= - LTLIBMULTITHREAD= - if test "$gl_use_threads" != no; then - dnl Check whether the compiler and linker support weak declarations. - AC_MSG_CHECKING([whether imported symbols can be declared weak]) - gl_have_weak=no - AC_TRY_LINK([extern void xyzzy (); -#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes]) - AC_MSG_RESULT([$gl_have_weak]) - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that - # it groks . It's added above, in gl_LOCK_EARLY_BODY. - AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no) - if test "$gl_have_pthread_h" = yes; then - # Other possible tests: - # -lpthreads (FSU threads, PCthreads) - # -lgthreads - gl_have_pthread= - # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist - # in libc. IRIX 6.5 has the first one in both libc and libpthread, but - # the second one only in libpthread, and lock.c needs it. - AC_TRY_LINK([#include ], - [pthread_mutex_lock((pthread_mutex_t*)0); - pthread_mutexattr_init((pthread_mutexattr_t*)0);], - [gl_have_pthread=yes]) - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) - if test -n "$gl_have_pthread"; then - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - AC_CHECK_LIB(pthread, pthread_kill, - [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread - # On Solaris and HP-UX, most pthread functions exist also in libc. - # Therefore pthread_in_use() needs to actually try to create a - # thread: pthread_create from libc will fail, whereas - # pthread_create will actually create a thread. - case "$host_os" in - solaris* | hpux*) - AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1, - [Define if the pthread_in_use() detection is hard.]) - esac - ]) - else - # Some library is needed. Try libpthread and libc_r. - AC_CHECK_LIB(pthread, pthread_kill, - [gl_have_pthread=yes - LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread]) - if test -z "$gl_have_pthread"; then - # For FreeBSD 4. - AC_CHECK_LIB(c_r, pthread_kill, - [gl_have_pthread=yes - LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r - LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r]) - fi - fi - if test -n "$gl_have_pthread"; then - gl_threads_api=posix - AC_DEFINE([USE_POSIX_THREADS], 1, - [Define if the POSIX multithreading library can be used.]) - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then - if test $gl_have_weak = yes; then - AC_DEFINE([USE_POSIX_THREADS_WEAK], 1, - [Define if references to the POSIX multithreading library should be made weak.]) - LIBTHREAD= - LTLIBTHREAD= - fi - fi - # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the - # pthread_rwlock_* functions. - AC_CHECK_TYPE([pthread_rwlock_t], - [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1, - [Define if the POSIX multithreading library has read/write locks.])], - [], - [#include ]) - # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. - AC_TRY_COMPILE([#include ], - [#if __FreeBSD__ == 4 -error "No, in FreeBSD 4.0 recursive mutexes actually don't work." -#else -int x = (int)PTHREAD_MUTEX_RECURSIVE; -return !x; -#endif], - [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1, - [Define if the defines PTHREAD_MUTEX_RECURSIVE.])]) - fi - fi - fi - if test -z "$gl_have_pthread"; then - if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then - gl_have_solaristhread= - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lthread" - AC_TRY_LINK([#include -#include ], - [thr_self();], - [gl_have_solaristhread=yes]) - LIBS="$gl_save_LIBS" - if test -n "$gl_have_solaristhread"; then - gl_threads_api=solaris - LIBTHREAD=-lthread - LTLIBTHREAD=-lthread - LIBMULTITHREAD="$LIBTHREAD" - LTLIBMULTITHREAD="$LTLIBTHREAD" - AC_DEFINE([USE_SOLARIS_THREADS], 1, - [Define if the old Solaris multithreading library can be used.]) - if test $gl_have_weak = yes; then - AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1, - [Define if references to the old Solaris multithreading library should be made weak.]) - LIBTHREAD= - LTLIBTHREAD= - fi - fi - fi - fi - if test "$gl_use_threads" = pth; then - gl_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_LINKFLAGS(pth) - gl_have_pth= - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lpth" - AC_TRY_LINK([#include ], [pth_self();], gl_have_pth=yes) - LIBS="$gl_save_LIBS" - if test -n "$gl_have_pth"; then - gl_threads_api=pth - LIBTHREAD="$LIBPTH" - LTLIBTHREAD="$LTLIBPTH" - LIBMULTITHREAD="$LIBTHREAD" - LTLIBMULTITHREAD="$LTLIBTHREAD" - AC_DEFINE([USE_PTH_THREADS], 1, - [Define if the GNU Pth multithreading library can be used.]) - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then - if test $gl_have_weak = yes; then - AC_DEFINE([USE_PTH_THREADS_WEAK], 1, - [Define if references to the GNU Pth multithreading library should be made weak.]) - LIBTHREAD= - LTLIBTHREAD= - fi - fi - else - CPPFLAGS="$gl_save_CPPFLAGS" - fi - fi - if test -z "$gl_have_pthread"; then - if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then - if { case "$host_os" in - mingw*) true;; - *) false;; - esac - }; then - gl_threads_api=win32 - AC_DEFINE([USE_WIN32_THREADS], 1, - [Define if the Win32 multithreading API can be used.]) - fi - fi - fi - fi - AC_MSG_CHECKING([for multithread API to use]) - AC_MSG_RESULT([$gl_threads_api]) - AC_SUBST(LIBTHREAD) - AC_SUBST(LTLIBTHREAD) - AC_SUBST(LIBMULTITHREAD) - AC_SUBST(LTLIBMULTITHREAD) -]) - -AC_DEFUN([gl_LOCK], -[ - AC_REQUIRE([gl_LOCK_EARLY]) - AC_REQUIRE([gl_LOCK_BODY]) - gl_PREREQ_LOCK -]) - -# Prerequisites of lib/lock.c. -AC_DEFUN([gl_PREREQ_LOCK], [ - AC_REQUIRE([AC_C_INLINE]) -]) - -dnl Survey of platforms: -dnl -dnl Platform Available Compiler Supports test-lock -dnl flavours option weak result -dnl --------------- --------- --------- -------- --------- -dnl Linux 2.4/glibc posix -lpthread Y OK -dnl -dnl GNU Hurd/glibc posix -dnl -dnl FreeBSD 5.3 posix -lc_r Y -dnl posix -lkse ? Y -dnl posix -lpthread ? Y -dnl posix -lthr Y -dnl -dnl FreeBSD 5.2 posix -lc_r Y -dnl posix -lkse Y -dnl posix -lthr Y -dnl -dnl FreeBSD 4.0,4.10 posix -lc_r Y OK -dnl -dnl NetBSD 1.6 -- -dnl -dnl OpenBSD 3.4 posix -lpthread Y OK -dnl -dnl MacOS X 10.[123] posix -lpthread Y OK -dnl -dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK -dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK -dnl -dnl HP-UX 11 posix -lpthread N (cc) OK -dnl Y (gcc) -dnl -dnl IRIX 6.5 posix -lpthread Y 0.5 -dnl -dnl AIX 4.3,5.1 posix -lpthread N AIX 4: 0.5; AIX 5: OK -dnl -dnl OSF/1 4.0,5.1 posix -pthread (cc) N OK -dnl -lpthread (gcc) Y -dnl -dnl Cygwin posix -lpthread Y OK -dnl -dnl Any of the above pth -lpth 0.0 -dnl -dnl Mingw win32 N OK -dnl -dnl BeOS 5 -- -dnl -dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is -dnl turned off: -dnl OK if all three tests terminate OK, -dnl 0.5 if the first test terminates OK but the second one loops endlessly, -dnl 0.0 if the first test already loops endlessly. - -# longlong.m4 serial 13 -dnl Copyright (C) 1999-2007 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 From Paul Eggert. - -# Define HAVE_LONG_LONG_INT if 'long long int' works. -# This fixes a bug in Autoconf 2.61, but can be removed once we -# assume 2.62 everywhere. - -# Note: If the type 'long long int' exists but is only 32 bits large -# (as on some very old compilers), HAVE_LONG_LONG_INT will not be -# defined. In this case you can treat 'long long int' like 'long int'. - -AC_DEFUN([AC_TYPE_LONG_LONG_INT], -[ - AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], - [AC_LINK_IFELSE( - [_AC_TYPE_LONG_LONG_SNIPPET], - [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. - dnl If cross compiling, assume the bug isn't important, since - dnl nobody cross compiles for this platform as far as we know. - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[@%:@include - @%:@ifndef LLONG_MAX - @%:@ define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - @%:@ define LLONG_MAX (HALF - 1 + HALF) - @%:@endif]], - [[long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0;]])], - [ac_cv_type_long_long_int=yes], - [ac_cv_type_long_long_int=no], - [ac_cv_type_long_long_int=yes])], - [ac_cv_type_long_long_int=no])]) - if test $ac_cv_type_long_long_int = yes; then - AC_DEFINE([HAVE_LONG_LONG_INT], 1, - [Define to 1 if the system has the type `long long int'.]) - fi -]) - -# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. -# This fixes a bug in Autoconf 2.61, but can be removed once we -# assume 2.62 everywhere. - -# Note: If the type 'unsigned long long int' exists but is only 32 bits -# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT -# will not be defined. In this case you can treat 'unsigned long long int' -# like 'unsigned long int'. - -AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], -[ - AC_CACHE_CHECK([for unsigned long long int], - [ac_cv_type_unsigned_long_long_int], - [AC_LINK_IFELSE( - [_AC_TYPE_LONG_LONG_SNIPPET], - [ac_cv_type_unsigned_long_long_int=yes], - [ac_cv_type_unsigned_long_long_int=no])]) - if test $ac_cv_type_unsigned_long_long_int = yes; then - AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, - [Define to 1 if the system has the type `unsigned long long int'.]) - fi -]) - -# Expands to a C program that can be used to test for simultaneous support -# of 'long long' and 'unsigned long long'. We don't want to say that -# 'long long' is available if 'unsigned long long' is not, or vice versa, -# because too many programs rely on the symmetry between signed and unsigned -# integer types (excluding 'bool'). -AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], -[ - AC_LANG_PROGRAM( - [[/* Test preprocessor. */ - #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - error in preprocessor; - #endif - #if ! (18446744073709551615ULL <= -1ull) - error in preprocessor; - #endif - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63;]], - [[/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull));]]) -]) - -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ(2.50) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) -]) - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -2906,7 +242,10 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -2919,7 +258,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -2928,21 +266,20 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], @@ -2995,6 +332,7 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` @@ -3004,7 +342,7 @@ # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -3012,860 +350,27 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT]) + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], - [$4]) +To get pkg-config, see .]) + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES -# po.m4 serial 15 (gettext-0.17) -dnl Copyright (C) 1995-2007 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ(2.50) - -dnl Checks for all prerequisites of the po subdirectory. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake - AC_REQUIRE([AM_NLS])dnl - - dnl Release version of the gettext macros. This is used to ensure that - dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Test whether it is GNU msgfmt >= 0.15. -changequote(,)dnl - case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; - *) MSGFMT_015=$MSGFMT ;; - esac -changequote([,])dnl - AC_SUBST([MSGFMT_015]) -changequote(,)dnl - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; - *) GMSGFMT_015=$GMSGFMT ;; - esac -changequote([,])dnl - AC_SUBST([GMSGFMT_015]) - - dnl Search for GNU xgettext 0.12 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Test whether it is GNU xgettext >= 0.15. -changequote(,)dnl - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; - *) XGETTEXT_015=$XGETTEXT ;; - esac -changequote([,])dnl - AC_SUBST([XGETTEXT_015]) - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) - - dnl Installation directories. - dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we - dnl have to define it here, so that it can be used in po/Makefile. - test -n "$localedir" || localedir='${datadir}/locale' - AC_SUBST([localedir]) - - dnl Support for AM_XGETTEXT_OPTION. - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= - AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) - - AC_CONFIG_COMMANDS([po-directories], [[ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - # Treat a directory as a PO directory if and only if it has a - # POTFILES.in file. This allows packages to have multiple PO - # directories under different names or in different locations. - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; 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 - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done]], - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake < 1.5. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) -]) - -dnl Postprocesses a Makefile in a directory containing PO files. -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], -[ - # When this code is run, in config.status, two variables have already been - # set: - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, - # - LINGUAS is the value of the environment variable LINGUAS at configure - # time. - -changequote(,)dnl - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - # Find a way to echo strings without interpreting backslash. - if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='echo' - else - if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='printf %s\n' - else - echo_func () { - cat < "$ac_file.tmp" - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - cat >> "$ac_file.tmp" < /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - cat >> "$ac_file.tmp" <> "$ac_file.tmp" < -#include -/* The string "%2$d %1$d", with dollar characters protected from the shell's - dollar expansion (possibly an autoconf bug). */ -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; -static char buf[100]; -int main () -{ - sprintf (buf, format, 33, 55); - return (strcmp (buf, "55 33") != 0); -}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, - [ - AC_EGREP_CPP(notposix, [ -#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ - notposix -#endif - ], gt_cv_func_printf_posix="guessing no", - gt_cv_func_printf_posix="guessing yes") - ]) - ]) - case $gt_cv_func_printf_posix in - *yes) - AC_DEFINE(HAVE_POSIX_PRINTF, 1, - [Define if your printf() function supports format strings with positions.]) - ;; - esac -]) - -# progtest.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1996-2003, 2005 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 -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1996. - -AC_PREREQ(2.50) - -# Search path for a program which passes the given test. - -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], -[ -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# 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. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in ifelse([$5], , $PATH, [$5]); do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - 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 -]) - -# size_max.m4 serial 6 -dnl Copyright (C) 2003, 2005-2006 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 From Bruno Haible. - -AC_DEFUN([gl_SIZE_MAX], -[ - AC_CHECK_HEADERS(stdint.h) - dnl First test whether the system already has SIZE_MAX. - AC_MSG_CHECKING([for SIZE_MAX]) - AC_CACHE_VAL([gl_cv_size_max], [ - gl_cv_size_max= - AC_EGREP_CPP([Found it], [ -#include -#if HAVE_STDINT_H -#include -#endif -#ifdef SIZE_MAX -Found it -#endif -], gl_cv_size_max=yes) - if test -z "$gl_cv_size_max"; then - dnl Define it ourselves. Here we assume that the type 'size_t' is not wider - dnl than the type 'unsigned long'. Try hard to find a definition that can - dnl be used in a preprocessor #if, i.e. doesn't contain a cast. - AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1], - [#include -#include ], size_t_bits_minus_1=) - AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)], - [#include ], fits_in_uint=) - if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then - if test $fits_in_uint = 1; then - dnl Even though SIZE_MAX fits in an unsigned int, it must be of type - dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. - AC_TRY_COMPILE([#include - extern size_t foo; - extern unsigned long foo; - ], [], fits_in_uint=0) - fi - dnl We cannot use 'expr' to simplify this expression, because 'expr' - dnl works only with 'long' integers in the host environment, while we - dnl might be cross-compiling from a 32-bit platform to a 64-bit platform. - if test $fits_in_uint = 1; then - gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" - else - gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" - fi - else - dnl Shouldn't happen, but who knows... - gl_cv_size_max='((size_t)~(size_t)0)' - fi - fi - ]) - AC_MSG_RESULT([$gl_cv_size_max]) - if test "$gl_cv_size_max" != yes; then - AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], - [Define as the maximum value of type 'size_t', if the system doesn't define it.]) - fi -]) - -dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. -dnl Remove this when we can assume autoconf >= 2.61. -m4_ifdef([AC_COMPUTE_INT], [], [ - AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) -]) - -# stdint_h.m4 serial 6 -dnl Copyright (C) 1997-2004, 2006 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 From Paul Eggert. - -# Define HAVE_STDINT_H_WITH_UINTMAX if exists, -# doesn't clash with , and declares uintmax_t. - -AC_DEFUN([gl_AC_HEADER_STDINT_H], -[ - AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, - [AC_TRY_COMPILE( - [#include -#include ], - [uintmax_t i = (uintmax_t) -1; return !i;], - gl_cv_header_stdint_h=yes, - gl_cv_header_stdint_h=no)]) - if test $gl_cv_header_stdint_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, - [Define if exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) - -# uintmax_t.m4 serial 10 -dnl Copyright (C) 1997-2004, 2007 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 From Paul Eggert. - -AC_PREREQ(2.13) - -# Define uintmax_t to 'unsigned long' or 'unsigned long long' -# if it is not already defined in or . - -AC_DEFUN([gl_AC_TYPE_UINTMAX_T], -[ - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then - AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) - test $ac_cv_type_unsigned_long_long_int = yes \ - && ac_type='unsigned long long' \ - || ac_type='unsigned long' - AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, - [Define to unsigned long or unsigned long long - if and don't define.]) - else - AC_DEFINE(HAVE_UINTMAX_T, 1, - [Define if you have the 'uintmax_t' type in or .]) - fi -]) - -# visibility.m4 serial 1 (gettext-0.15) -dnl Copyright (C) 2005 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 From Bruno Haible. - -dnl Tests whether the compiler supports the command-line option -dnl -fvisibility=hidden and the function and variable attributes -dnl __attribute__((__visibility__("hidden"))) and -dnl __attribute__((__visibility__("default"))). -dnl Does *not* test for __visibility__("protected") - which has tricky -dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on -dnl MacOS X. -dnl Does *not* test for __visibility__("internal") - which has processor -dnl dependent semantics. -dnl Does *not* test for #pragma GCC visibility push(hidden) - which is -dnl "really only recommended for legacy code". -dnl Set the variable CFLAG_VISIBILITY. -dnl Defines and sets the variable HAVE_VISIBILITY. - -AC_DEFUN([gl_VISIBILITY], -[ - AC_REQUIRE([AC_PROG_CC]) - CFLAG_VISIBILITY= - HAVE_VISIBILITY=0 - if test -n "$GCC"; then - AC_MSG_CHECKING([for simple visibility declarations]) - AC_CACHE_VAL(gl_cv_cc_visibility, [ - gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fvisibility=hidden" - AC_TRY_COMPILE( - [extern __attribute__((__visibility__("hidden"))) int hiddenvar; - extern __attribute__((__visibility__("default"))) int exportedvar; - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void);], - [], - gl_cv_cc_visibility=yes, - gl_cv_cc_visibility=no) - CFLAGS="$gl_save_CFLAGS"]) - AC_MSG_RESULT([$gl_cv_cc_visibility]) - if test $gl_cv_cc_visibility = yes; then - CFLAG_VISIBILITY="-fvisibility=hidden" - HAVE_VISIBILITY=1 - fi - fi - AC_SUBST([CFLAG_VISIBILITY]) - AC_SUBST([HAVE_VISIBILITY]) - AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], - [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) -]) - -# wchar_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 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 From Bruno Haible. -dnl Test whether has the 'wchar_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WCHAR_T], -[ - AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, - [AC_TRY_COMPILE([#include - wchar_t foo = (wchar_t)'\0';], , - gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) - if test $gt_cv_c_wchar_t = yes; then - AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) - fi -]) - -# wint_t.m4 serial 2 (gettext-0.17) -dnl Copyright (C) 2003, 2007 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 From Bruno Haible. -dnl Test whether has the 'wint_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WINT_T], -[ - AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, - [AC_TRY_COMPILE([ -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be included - before . */ -#include -#include -#include -#include - wint_t foo = (wchar_t)'\0';], , - gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) - fi -]) - -# xsize.m4 serial 3 -dnl Copyright (C) 2003-2004 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. - -AC_DEFUN([gl_XSIZE], -[ - dnl Prerequisites of lib/xsize.h. - AC_REQUIRE([gl_SIZE_MAX]) - AC_REQUIRE([AC_C_INLINE]) - AC_CHECK_HEADERS(stdint.h) -]) - # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -4904,4 +1409,36 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_check_gl.m4]) +m4_include([m4/ax_check_glu.m4]) +m4_include([m4/ax_lang_compiler_ms.m4]) +m4_include([m4/ax_pthread.m4]) +m4_include([m4/codeset.m4]) +m4_include([m4/gettext.m4]) +m4_include([m4/glibc21.m4]) +m4_include([m4/iconv.m4]) +m4_include([m4/intdiv0.m4]) +m4_include([m4/intmax.m4]) +m4_include([m4/inttypes-pri.m4]) +m4_include([m4/inttypes.m4]) +m4_include([m4/inttypes_h.m4]) +m4_include([m4/isc-posix.m4]) +m4_include([m4/lcmessage.m4]) +m4_include([m4/lib-ld.m4]) +m4_include([m4/lib-link.m4]) +m4_include([m4/lib-prefix.m4]) +m4_include([m4/longdouble.m4]) +m4_include([m4/longlong.m4]) +m4_include([m4/nls.m4]) +m4_include([m4/po.m4]) +m4_include([m4/printf-posix.m4]) +m4_include([m4/progtest.m4]) +m4_include([m4/signed.m4]) +m4_include([m4/size_max.m4]) +m4_include([m4/stdint_h.m4]) +m4_include([m4/uintmax_t.m4]) +m4_include([m4/ulonglong.m4]) +m4_include([m4/wchar_t.m4]) +m4_include([m4/wint_t.m4]) +m4_include([m4/xsize.m4]) m4_include([acinclude.m4]) diff -Nru pcb-20100929/ChangeLog pcb-20110918/ChangeLog --- pcb-20100929/ChangeLog 2010-09-29 19:17:30.000000000 +0000 +++ pcb-20110918/ChangeLog 2011-09-18 17:39:41.000000000 +0000 @@ -1,3 +1,5484 @@ +2011-09-18 DJ Delorie * dj AT delorie dot com * + + * po/POTFILES.in: Remove src/hid/common/hidgl_package_vrml_y.c from + POTFILES.in Reverts 61bd0cb1e134bbea96abd6fd2d5fb94d09c0b3c8 as this file + doesn't exist in this repository, causing a distcheck failure. + +2011-09-18 DJ Delorie * dj AT delorie dot com * + + * : Update golden files for nanometers hid_png3 was off by a pixel on a line end. I retested my UV and TT + films to verify that the nanometers conversion didn't affect line + *widths* and updated the golden file to accept this one-pixel + difference. + +2011-09-17 DJ Delorie * dj AT delorie dot com * + + * src/action.c: [windows] use unix-style path separators when + calling gnetlist + +2011-09-17 Felix Ruoff * Felix AT posaunenmission dot de * + + * : commit 70db91fc3dfb8b378962794fc8f86f71b52f7af8 Author: + Kai-Martin Knaak * kmk AT lilalaser dot de * Date: Fri Sep 16 + 01:07:32 2011 +0200 + +2011-09-16 Kai-Martin Knaak * kmk AT lilalaser dot de * + + * doc/pcb.texi: remove panner control from documentation There is no panner control in the GUI (anymore?) since at least five + years. this pathc removes its description from the texi manual. + +2011-09-17 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/file.c, src/main.c: Don't adjust the Library command settings + if they are NULL, or an empty string. (The empty string part is a fixup for commit + 31df66e87a810aac852139da9119b15c47fa8c71 - this will teach me for bikeshedding) The NULL part should fix bug lp-852598 Closes-bug: lp-852598 + +2011-09-17 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/file.c, src/main.c: Bikeshed commit + 11700ba8c3c951a788c8190073eb09822060dfdd I don't like magic strings, and IMO, using a blank + LibraryContentsCommand string to imply "don't use this feature" is + better than "*NONE*". + +2011-09-17 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Set the LC_NUMERIC locale + to "C" rather than "POSIX" This value is supported on Win32 platforms, whereas "POSIX" doesn't + appear to have any effect. This was one possible way to fix the "zoom doesn't work" bug on + Win32 for locales which use "," as the decimal separator. DJ fixed the Zoom action to be locale independent in commit + fd5399c67b988f2f7c9d1a0b4ab7c13bc2e95158, which worked around the + problem for this particular action, but I feel it would be best that + we made our locale handling consistent between Linux and Win32 as + well. Affects-bug: lp-843577 + +2011-09-08 Dima Kogan * dima AT secretsauce dot net * + + * src/djopt.c: fixed an instance of the "only-optimize-autorouted" + flag being ignored Signed-off-by: Dima Kogan * dima AT secretsauce dot net * + +2011-09-16 DJ Delorie * dj AT delorie dot com * + + * src/file.c, src/main.c: Skip the M4 library on Windows On Windows, set the LibraryContentsCommand to the magic string + "*NONE*" and check for that string while loading the libraries. + This avoids the windows pcb.exe from trying to run bash or m4 + scripts, which are normally not available, yet allows the user a way + to re-enable them if they want. + +2011-09-16 DJ Delorie * dj AT delorie dot com * + + * src/hid/gtk/gtkhid-main.c, src/hid/lesstif/main.c: De-localize + zoom parsing The values used for Zoom() were being parsed with strtod(), which + switches between '.' and ',' depending on locale. Switch to + g_ascii_strtod() which always uses '.' and thus always matches our + actions. Note: I didn't change the command line parsing, because I didn't + think we should impose '.'-centric syntax on other locales. + +2011-09-16 DJ Delorie * dj AT delorie dot com * + + * lib/generic.list: Add DIL footprint names and R025. Existing tutorials say to use "DIL 16 300" for DIPs (we use "N 16 + 300") and often call for the R025 footprint, so add them as aliases + so the m4-to-newlib converter includes them. + +2011-09-16 DJ Delorie * dj AT delorie dot com * + + * lib/m4lib_to_newlib.sh: Fix m4-to-newlib converter filenames The m4 library uses macros and parameters to describe footprints, + which allows for a *very* flexible footprint naming scheme. While + it is impossible for pcb to know all valid footprint values, it does + have a list of "standard" ones, and knows how to obtain those. + However, the m4 to newlib converter wasn't using the same footprint + naming convention as everyone else, so produced *.fp files that + weren't always useful. For example, there were a large number of + 300.fp files that all collided. With this fix, the footprint name matches the value in [...] in the + library window, which is what we tell people to use for the + "footprint=" attribute anyway. + +2011-09-16 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/lesstif.h: Wrap all XmStrings in gettext() + +2011-09-15 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * po/POTFILES.in: Add another missing source file to POTFILES.in + +2011-09-15 DJ Delorie * dj AT delorie dot com * + + * src/main.c: Add locale functions Add textdomain() and setlocale() to connect to our message catalogs. + +2011-09-15 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * po/POTFILES.in: Add some missing files to POTFILES.in (And sorted the file contents). Reported-by: Bert Timmerman * bert dot timmerman AT xs4all dot nl * + Affects-bug: lp-846368 + +2011-09-09 Bert Timmerman * bert dot timmerman AT xs4all dot nl * + + * po/nl.po: Updated the Dutch translation. + +2011-09-15 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/report.c: report.c: Don't leave actions in the undo stack or + change the user's flags Some actions in ReportNetLength*() would have been lumped in with + whatever actions were next added to the undo stack. These functions + also left the user's board with a different "FOUND" flags on various + items. In the case of the "Report(AllNetLenths)" action, a very long undo + stack would be created, which is not very helpful to the user. These changes hide the internal flag changes made during the net + length calculation from the undo system. We are able to get back to the inital board state because we save + the operations caused by our initial RestConnections() on the undo + stack. After we have done our work (modifying various flags in the + process), we reset the flags again (this time bypassing the Undo + system), so the board is consistent with the ResetConnections() call + we DID save undo data for. We then Undo() these changes before we + leave the function. + +2011-09-15 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/report.c: report.c: Return 1 for all failure conditions in + ReportNetLengthByName() + +2011-09-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/undo.c: undo.c: Add error message where + RestoreUndoSerialNumber() will break things If operations are addded to the undo stack between a call to + IncrementUndoSerialNumber() and a subsequent call for + RestoreUndoSerialNumber(), those added operations will be placed in + the undo stack with an inconsistent serial number. The {Save,Restore}UndoSerialNumber() API is pretty fragile in this + regard, and we should avoid using it where possible. An better alternative might be to implement a + "LockUndoSerialNumber()" call which temporarily disables + IncrementUndoSerialNumber(), and a "UnlockUndoSerialNumber()" call + which re-enables its increment function. Better yet - we could make these functions nestable, so we need not + worry whether some action uses this new feature internally when we + are also using it. + +2011-09-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/undo.c: undo.c: Handle undo failures in a more sane manner Our current error-case handling can cause serial number + inconsistency when something goes wrong when performing an Undo + operation. There are also various logic flaws in our handling, as it + only catches failures where every sub-undo operation with that + serial number fails. Remove the confusing do-loop which decrements the serial number in + the failure case, and return some sensible error message instead. This patch also removes the code which looked like it was intended + to loop over the undo stack until a serial number was found to + operate on. It is advantageous for code like the DRC to be able to + add increment the undo serial number, then safely perform an Undo - + even if there were no changes logged in the undo system during the + previous serial number. Closes-bug: lp-848509 + +2011-09-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/undo.c: undo.c: Allow undo of locked objects Our internal actions can make changes to locked objects, then use + the undo mechanism to revert these changes. An example is DRC, which + changes flags on objects and uses the Undo system to restore their + original values. Affects-bug: lp-848509 + +2011-09-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/find.c: find.c: Remove stray RestoreUndoSerialNumber() calls These will cause havoc with the undo system, as we don't actually + save a serial number to restore to. Until a commit efd212c1deb264e9a7f2be17e9338fbb60e22cc0 we were + saving a serial number at the start of each "ResetConnections + (true);" call, and it would have been that serial number which got + restored. With this and some other fixes to the undo system, these restores + are no longer required. Affects-bug: lp-848509 + +2011-09-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: gtk: Fix ghid_zoom_view_fit() to work + when the board is flipped. Affects-bug: lp-850311 + +2011-09-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidgl.c, src/hid/gtk/gtkhid-gl.c: Fixup OpenGL + includes for better compatibility with OSX Not tested ;) + +2011-09-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * autogen.sh, configure.ac, m4/ax_check_gl.m4, m4/ax_check_glu.m4, + m4/ax_lang_compiler_ms.m4, m4/ax_pthread.m4: Better autoconf tests + for GL and GLU (from GtkGLExt - GPL v2 or later) These tests should give better cross platform support for our build. + +2011-09-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * .gitignore, m4/.gitignore: Remove the m4 directory from the root + .gitignore file and add its own + +2011-09-13 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/styles.c: [lesstif] set units for styles dialog in + more places The styles dialog was segfaulting as the units hadn't been set yet, + if you open the style dialog before doing anything with the grid. + +2011-09-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: hid/gtk: Remove misplaced (and redundant) + hidgl_flush_triangles() call. If we were to flush the triangle buffer in ghid_show_crosshair(), we + should do it before we set XOR mode on the GL context (assuming the + buffer might be dirty when we are called), and we should do it after + we finish drawing (if we wish to leave the buffer clean when we + return). The location the flush was in before this commit is just plain + wrong. As we currently have flushes of the triangle buffer wrapping the + call to ghid_show_crosshair(), just leave the flushing out of this + function. Does this commit message provide an adequate example of simple + patch, complex commit message phenomenon? + +2011-09-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-config.c, + src/hid/gtk/gui-output-events.c, src/hid/gtk/gui.h: hid/gtk: Remove + auto-pan feature (kill it with fire). This seems to be fairly universally unpopular on geda-user, and its + implementation is a little fragile, often leading the board to pan + off to some corner of the board as the poor user reaches for the + layer selector or a menu without having remembered to click the + feature off. The fact that the pan direction and speed was set the instant you + leave the drawing window also made it particularly unhelpful. A + proper implementation should have grabbed the mouse - or at least + implemented some buffer zone in which the mouse could be used to + give feedback on the pan direction. + +2011-09-11 DJ Delorie * dj AT delorie dot com * + + * src/hid/gtk/gtkhid-main.c: [windows] set GDK_PIXBUF_MODULE_FILE If we're using a local gdk-pixbuf installation, we need to set this + env variable to point to it. + +2011-09-11 Bdale Garbee * bdale AT gag dot com * + + * doc/Makefile.am: Invoke eps2png in $(srcdir), no . + +2011-09-12 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidgl.c: hid/common: Remove #include "draw.h" from + hidgl.c (twice!) + +2011-09-11 Dima Kogan * dima AT secretsauce dot net * + + * src/hid/gtk/ghid-route-style-selector.c, + src/hid/gtk/ghid-route-style-selector.h, src/hid/gtk/gtkhid-main.c: + Re-ordered all references in the style selector dialog to have one + consistent ordering. Everything that refers to the settings in the style selector dialog + now does so in order of Line thickness Hole size Hole thickness (hole + annular ring) + keepaway region size This wasn't 100% consistent previously, which resulted in a bug + (fixed in a previous patch). This patch doesn't touch the + functionality, but improves the style to avoid future bugs. Modified to apply on recent route style selector changes by Bert + Timmerman. Signed-off-by: Andrew Poelstra (local) * apoelstra AT wpsoftware + dot net * Affects-bug: lp-844635 + +2011-09-11 Dima Kogan * dima AT secretsauce dot net * + + * src/hid/gtk/ghid-route-style-selector.c: Swap via-hole and -ring + size connection in route style selector dialog Closes-bug: lp-844635 Signed-off-by: Andrew Poelstra (local) * apoelstra AT wpsoftware + dot net * + +2011-09-10 Andrew Poelstra (local) * apoelstra AT wpsoftware dot net * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: Repopulate route style selector on PCBChanged + action When loading a new pcb, Bad Things happen to the route style + selector because pcb's route style data is freed. This patch removes + all styles from the route style selector and re-adds them whenever a + new pcb is loaded. + +2011-09-10 Andrew Poelstra (local) * apoelstra AT wpsoftware dot net * + + * src/hid/gtk/ghid-route-style-selector.c, + src/hid/gtk/ghid-route-style-selector.h: Add + ghid_route_style_selector_empty to GHidRouteStyleSelector + +2011-09-10 Andrew Poelstra (local) * apoelstra AT wpsoftware dot net * + + * src/hid/gtk/ghid-route-style-selector.c: Add finalize function to + GHidRouteStyleSelector + +2011-09-09 Bert Timmerman * bert dot timmerman AT xs4all dot nl * + + * po/POTFILES.in: Remove the src/hid/gtk/gui-dialog-size.c entry + from the translatable files list. This is a completion of commit: + a914d5ba58104d8559395b66798b35761afb991a "Replace old route style + selector with GHidRouteStyleSelector" dated 20110903 11:09 PM + +2011-09-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/ghid-layer-selector.c: hid/gtk: Filter out double + clicks on the layer selector widget This makes things behave a little nicer if you click to toggle a + layer's visibility twice in quick succession. Previously, this would + be interpreted as a double-click, causing an extra synthetic click + event which would toggle the visibility an extra time. + +2011-09-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Update file-changed + notification bar to match gedit a bit more 1. Add a stock "refresh" image to the "Reload" button. 2. Change the message text when the board has modifications. 3. Reload without further prompting if the user presses "Reload", even if the board is modified. (We already warned them due to + 2.) + +2011-09-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: hid/gtk: Reimplement file-change monitor without + GFileMonitor I must have had a brain-fail when I hooked up setting up the + file-changed monitor in the function which sets the window title. + NB: That also gets called after every menu operation! A better place to hook up the monitor would be + ghid_sync_with_new_layout(), however changing this alone revealed + another issue - we would get notified for changes WE make to the + files. We were avoiding those events as the file-monitor was being + reset before it could pop up, at the end of the menu action which + invoked the save). However - due to a race condition bug in GLib / GIO, we would + sometimes see change notify events for changes we made, even when we + hooked up the GFileMonitor AFTER having saved (and synced) our + changes to disk. Rather than attempt to work around this bug, implement the + file-change notification in a much more simple way - look at the + file mtime when we update the layout, and at each time the mouse + pointer enters the main window. FWIW, this is how gedit currently + achieves the same feature. + +2011-09-06 DJ Delorie * dj AT delorie dot com * + + * src/action.c: Warn user if footprints can't be found on import Since the message log doesn't make it obvious, add a pop-up dialog + whenever there are missing footprints during an import. Affects-bug: lp-828388 + +2011-09-06 DJ Delorie * dj AT delorie dot com * + + * src/search.c: Fix math error in IsPointOnLine() The math in C didn't match the math in the comment (and, apparently, + hasn't for quite some time). To test: Draw three lines, from 1000,3000 to 1500,2500, then to + 2000,3000, then back to the start at 1000,3000. Without this patch, + the first and last lines are removed and replaced with a copy of the + second line. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/file.c, src/file.h, src/hid/common/actions.c: + Implement a new RevertPCB() call, sharing code with LoadPCB() The RevertPCB() takes no filename parameter, and aside from that, + the only difference to LoadPCB is that when it calls the GUI's + "PCBChanged" action, it passes a new "revert" argument. This should + let the GUIs optionally do less work resetting the view state for a + board being reverted. + +2011-09-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/command.c, src/hid.h: Add a HID API call, + notify_pcb_filename_change() This is so the core can tell the GUI when the PCB being edited is + saved into a different file. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/file.c, src/hid.h: Add a HID API call, notify_save_pcb() + called around saving the PCB The intention of this API is so that GUIs monitoring the active PCB + file on disk for changes, can filter out changes which occur as we + save the file ourselves. + +2011-09-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/command.c, src/file.c: file.c: Don't set the PCB + filename or changed flags inside SavePCB (Filename) Save this for the caller to do. (action.c already set the filename + for the SaveAs case anyway). + +2011-09-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: Revert "hid/gtk: Avoid the deprecated + gdk_drawable_get_display()" This reverts commit c6d6ca16e58b5c7f2248c21e3248825f54e52374. Turns out the replacement API I used was only introduced in GTK + 2.24, which is still a little new for us here. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c, src/hid/gtk/gui-utils.c: hid/gtk: + Remove usage of deprecated gtk_range_set_update_policy() We only set this to the default value anyway, and the API has been + removed with no replacements. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c, src/hid/gtk/gui-utils.c: hid/gtk: + Replace gtk_container_border_width with + gtk_container_set_border_width Replaces the old deprecated API. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-utils.c: hid/gtk: Use g_signal_connect(), not + gtk_signal_connect() gtk_signal_connect() is deprecated. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-dialog-print.c: hid/gtk: Re-write the tool-tip + handling code to use newer tooltip API Use the gtk_widget_set_tooltip* API introduced in GTK 2.12. This + avoids the APIs deprecated in GTK 2.12, and also avoids the + requirement to pack GTK_WIDGET_NO_WINDOW widgets inside + gtk_event_box() widgets to make their tooltips work. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-drc-window.c, src/hid/gtk/gui-library-window.c, + src/hid/gtk/gui-log-window.c, src/hid/gtk/gui-netlist-window.c, + src/hid/gtk/gui-pinout-window.c, src/hid/gtk/gui-top-window.c: + hid/gtk: Replace usage of the deprecated gtk_widget_set_uposition() + call The closest replacement is gtk_window_move(), and looking at the GTK + sources, appears to be what gtk_widget_set_uposition() calls + internally. We are still rather at the mercy of the user's window manager as to + whether it will honour the request we make, and arguably we ought to + remove this (mis-)feature anyway. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-dialog.c: hid/gtk: Replace deprecated function + call gtk_box_pack_start_defaults() + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Avoid the deprecated + gdk_drawable_get_display() Grab the active display using gdk_window_get_display() on the window + belonging to the drawing area. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Use the g_timeout_add() + function, not the deprecated GTK one. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/ghid-main-menu.c: hid/gtk: Fix not accessing + GtkMenuShell's children harder I missed a critical part of the fix from commit + 3584101f67f6ca2f0a252c312cb0c6c9c4fa016f + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-pinout-preview.c: hid/gtk: Replace + GTK_WIDGET_REALIZED() test with a check for window != NULL This avoids the use of the deprecated GTK_WIDGET_REALIZED macro, + without needing to use the GTK2.20 function + gtk_widget_get_realized(). The check for a NULL window should be + sufficient here I hope. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-command-window.c: hid/gtk: Use gtk_bin_get_child() + accessor In GTK3.0, direct access to bin->child will be impossible. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-config.c: hid/gtk: Use gtk_notebook_get_n_pages() + rather than diving in and counting In GTK3.0, direct access to notebook->children will be impossible. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/ghid-main-menu.c: hid/gtk: Don't access a + GtkMenuShell's children directly In GTK3.0, direct access to shell->children will be impossible. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/ghid-main-menu.c: hid/gtk: Free list returned from + gtk_container_get_children() We can (and should) g_list_free() the list of children returned when + we are finished with it. Whilst we are at it, convert the while loop to a for loop and use a + tighter condition on the loop termination test. The existing test + worked, but would leave a negative number in the object counter we + test against. This would not work if the object counters were ever + unsigned integers (as they might plausibly be). + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/ghid-route-style-selector.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-dialog-print.c, + src/hid/gtk/gui-dialog.c, src/hid/gtk/gui-library-window.c, + src/hid/gtk/gui-utils.c: hid/gtk: Use accessors to get the vbox from + GtkDialog In GTK3.0, direct access to dialog->vbox will be impossible. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-output-events.c: hid/gtk: Use accessor functions + for handling GtkAdjustments In GTK3.0, direct access to these member variables will be + impossible. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-config.c, src/hid/gtk/gui-top-window.c: hid/gtk: + Don't use GTK_WIDGET_SET_FLAGS() Call the appropriate setter function instead. (For GTK3.0 + compatibility). + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-library-window.c: hid/gtk: Don't test for NOOP + before calling gtk_widget_set_sensitive() We were using a deprecated test macro anyway, GTK already does a + NOOP test inside gtk_widget_set_sensitive(). + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-utils.c, src/hid/gtk/gui.h: hid/gtk: Remove unused + function ghid_button_set_text() + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-utils.c, src/hid/gtk/gui.h: hid/gtk: Remove unused + function ghid_button_active() + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gui-drc-window.c: hid/gtk: + Use gtk_widget_get_style() accessor, rather than direct access In GTK3.0, direct access to widget->style will be impossible. Swap out the GTK_WIDGET_STATE() macro for gtk_widget_get_state(), + which does not directly access the GSeal'd member widget->state. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui-misc.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui-pinout-preview.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui-utils.c: hid/gtk: Use gtk_widget_get_window() + accessor In GTK3.0, direct access to widget->window will be impossible. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c, src/hid/gtk/gui-drc-window.c, + src/hid/gtk/gui-keyref-window.c, src/hid/gtk/gui-library-window.c, + src/hid/gtk/gui-log-window.c, src/hid/gtk/gui-netlist-window.c, + src/hid/gtk/gui-top-window.c: hid/gtk: Use + gtk_widget_get_allocation() accessor In GTK3.0, direct access to widget->allocation will be impossible. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c: hid/gtk: Use + gtk_widget_get_allocation() not gdk_window_get_geometry() This avoids an unnecessary round-trip the the X server on X11 + platforms. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c: hid/gtk: Avoid warning caused by early + drawing before gport->pixmap is set Avoids a command line warning: (pcb:28876): Gdk-CRITICAL **: IA__gdk_draw_drawable: assertion + `GDK_IS_DRAWABLE (src)' failed With the GDK renderer in use. This trigger appears to be some state changes triggered as the new + layer selector widget initialises. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-misc.c: hid/gtk: Clean and make + gport_set_cursor_type() more GTK3.0 compatible Also removes the DEFAULT_CURSOR return value (for the case of no + window being setup) to GDK_X_CURSOR (the 0 enum value), as the code + path which returned DEFAULT_CURSOR would never have been hit. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/ghid-cell-renderer-visibility.c: hid/gtk: Use + gtk_cell_renderer_get_{align,pad} accessors In GTK3.0, direct access to these fields will be impossible. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Avoid double-destroying the + file-changed info_bar on "Reload" This was caused by an addition I made in the earlier patch to + destroy the info_bar when the user manually reverts or loads a new + file). The callback on revert button was trying to delete it (again) after + the revert _action_ we call triggered a destroy of the widget. Avoid + this by destroying the info_bar before we call the revert action. + +2011-09-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: gtk: use + gtk_action_block_activate() in layer selector The GHidLayerSelector widget now uses gtk_action_block_activate() + instead of storing/blocking signal IDs. This is the proper way to + suppress signal emission since 2.16. This also fixes the lockup bug that was supposed to be fixed by the + recent commit 8857757, but still occured when using the menus to + toggle layers. + +2011-09-05 DJ Delorie * dj AT delorie dot com * + + * src/const.h, src/draw.c, src/misc.c, src/print.c, src/report.c: + Fix text scaling exceeding Coord max. The old way of scaling text was to multiply by scale/100 but this + could easily overflow on reasonably sized boards with a 32-bit Coord + type. The new code scales by (double)scale/100.0 instead. Since we + don't store scaled values in the PCB file, a loss of precision won't + matter, but a double has 53 bits of precision - in nanometers, + that's a board about the size of North America. Closes-bug: lp-832451 + +2011-09-05 DJ Delorie * dj AT delorie dot com * + + * configure.ac, globalconst.h, src/global.h: Add configure selection + of 32/64 Coord type --enable-coord64 Force 64-bit coordinate types --enable-coord32 Force 32-bit coordinate types Defaults to "long" as before, but if you give one of the above, the + type changes to a suitable 32-bit or 64-bit type. Note that this is + only guaranteed to be the size you choose if you have + which most OSs provide, else the "int" and "long long" types are + used instead. + +2011-09-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: gtk: Fix "clicking on layer + selector separator bug" If you click on the selector between real and virtual layers in the + pcb layer selector, it will toggle the first layer. This patch + simply ignores the click. + +2011-09-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c, src/hid/gtk/gui-top-window.c: + gtk: fix behavior when hiding the last visible layer When you try to toggle the last layer invisible, pcb should refuse + to let you do so, since something has to be selected, and we don't + allow selection of invisible layers. What actually happens is that pcb locks up. This patch fixes that. + +2011-09-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c: gtk: Force silk and rat layers + visible when they are selected. + +2011-09-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-route-style-selector.c, + src/hid/gtk/ghid-route-style-selector.h, src/hid/gtk/gtkhid-main.c: + Implement RouteStylesChanged action This action looks at the actual route-style settings (i.e., + Settings.LineThickness), and gives these to the route style + selector. The selector looks in its list and selects a style, if one + matches. Otherwise, it does nothing. + +2011-09-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-route-style-selector.c, + src/hid/gtk/ghid-route-style-selector.h, + src/hid/gtk/gui-command-window.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: Add Ctrl+F1,F2,F3,... accelerators to route style + selector Since we now have three accelerator groups to worry about (those of + the layer selector, route style selector and main menu), I have + moved the hooking/unhooking code into two functions: ghid_install_accel_groups () ghid_remove_accel_groups () These should be used whenever accelerators need to be disabled, for + example, when the user has the command box active. + +2011-09-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: Remove the last + of ghidgui->toggle_holdoff + +2011-09-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/Makefile.am, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui-dialog-size.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: Replace old route style selector with + GHidRouteStyleSelector TODO: The RouteStylesChanged action is now very broken. Menu accelerators need to be installed + +2011-09-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-main-menu.c, src/hid/gtk/ghid-main-menu.h: + Introduce functions for GHidRouteStyleSelector handling to menu + +2011-09-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/Makefile.am, src/hid/gtk/ghid-route-style-selector.c, + src/hid/gtk/ghid-route-style-selector.h: Introduce + GHidRouteStyleSelector widget, don't use it yet + +2011-09-04 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: hid/gtk: Add file + change notification for the currently open PCB If the file is modified on disk, a bar appears at the top of the PCB + area offering the user a choice as to whether they wish to reload + the board or cancel (do nothing). If the user has changes, and hits reload - they are prompted as to + whether they wish to throw away their changes. Requires GTK 2.18 or higher due to use of the GtkInfoBar widget. + +2011-09-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * configure.ac: Require GTK 2.18 or later for the GTK HID. This is for some new widgets, like the GtkInfoBar. + +2011-09-04 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: hid/gtk: Fix + styling of menubar area so it is consistent across its width This relies on some nasty tricks copying GtkStyle's between the + menubar widget and a new GtkEventBox widget we pack the top bar in + to give us a background to paint on. We also adjust the styles of + the coordinate read- out labels and frames to ensure they are + legible. There may still be some inconsistencies, as the coordinate selector + button is themed as if it were a toolbar button, hence the + colourings used may be designed to work with a different background + colour than we have. + +2011-09-04 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: hid/gtk: Create a + GtkToolbar of mode buttons for compact vertical mode Rather than packing our mode buttons into an hbox, use a proper + GtkToolbar so theming will match the rest of the user's desktop. This simplifies code to switch compact mode on and off, as we have + two distinct widgets to show / hide, rather than having to reparent + the mode buttons each time. It does, however mean we have to be careful not to double-trigger + events when keeping the two sets of mode buttons in sync with each + other, so that isn't ideal. In the longer term, we probably ought to split out the mode button + area on the left-hand toolbar as a separate self-contained widget. + +2011-09-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-cell-renderer-visibility.c: gtk: Prelight toggle + swatches in layer selector This brightens the layer visibility swatches subtly when the mouse + hovers over them. IMHO this improves the discoverability of the + widget without being distracting or misleading. + +2011-09-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: gtk: Don't gray out invisible + layers' text in the selector + +2011-09-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: gtk: toggle non-activatable + layers on click, without checking for swatch + +2011-09-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-config.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: hid/gtk: Remove compact_vbox and compact_hbox + +2011-09-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-config.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: hid/gtk: Always show the PCB name on the + title-bar, not the toolbar This saves space and reduces code complexity + +2011-09-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: hid/gtk: Don't + use a GtkEventBox as a container widget We weren't making use of the events from the event box, and appeared + just to be using it as a convenient container to allow setting the + sensitivity on our entire left hand toolbar at once. Scrap the event box widget and just store a pointer to the vbox + widget which the left toobar items are packed into. We can set the + sensitivity on this and get the desired effect. + +2011-09-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-pinout-window.c, src/hid/gtk/gui-top-window.c: + hid/gtk: Don't pack the drawing area in a GtkViewport widget (For both the main window and the pinout preview). The GtkViewport + widget is designed to add scroll bars to a widget which doesn't have + native scroll capabilities. We are handling out own scroll-bars, so + the only gain we had from the GtkViewport we added was a shadow + around the widget. If we decide we want the shadow back, a more appropriate widget to + pack the drawing area with might be a GtkFrame. + +2011-09-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Remove the vbox used to + pack ghidgui->compact_hbox The main effect here is that the contents of the compact_hbox will + get more vertical space assigned to them if the menu bar section is + taller than the natural size of those widgets. The visual change seems acceptable, and we could use every bit of + code-cleanup in ghid_build_pcb_top_window() + +2011-09-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Remove some more temporary + variable assignments These make the code harder to follow, as the same temporary variable + is used again and again to refer to different widgets. + +2011-09-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: hid/gtk: Don't + use an hbox to pack the board name label The hbox only has one child, so use the name label directly. + +2011-09-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Skip the generic "hbox" + variable when storing the widget anyway For widgets we keep references to in the ghidgui structure, we avoid + confusion by assigning directly to the more descriptive ghidgui + variable. + +2011-09-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Don't pack a frame around + the menu bar + +2011-09-02 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-dialog-size.c, src/misc.c, src/misc.h: Move + make_route_string() from gtk into misc.c + +2011-09-02 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/mymem.c, src/mymem.h: Const-correct StripWhiteSpaceAndDup in + mymem.c + +2011-09-01 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Attempt to fix logic to flip + component / solder group visibility on flip Should get back to better behaviour. I probably broke this somewhat + with commit f903b4be6b85efc110852f7be40edf8245f0a513, which + attempted to re-state the previous logic in a clearer fashon. The logic now should: If flipping sides, and only ONE of the solder / component layers + (groups) is visible, and that layer (group) is _active_, then swap + the visibilities of the component / solder layers (groups), and make + the newly visible layer (group) active. There are still bugs in this code relating to the assumption that + the first entry in the layer group is the one which is being + toggled. This breaks if the first entry in the group is that + corresponding to the silk for that side of the board. + +2011-08-31 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: gtk: fix typo preventing layer + selector menu items from working + +2011-08-31 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c: gtk: remove in_toggle_view + recursion-prevention flag We don't call ToggleView programmatically anywhere, so it is + impossible for there to be recursion. + +2011-08-31 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-main-menu.c: Block signals in + ghid_main_menu_update_toggle_state() The function ghid_main_menu_update_toggle_state() is supposed to + sync the menu checkboxes to the actual state of pcb, by checking the + flags given in the resource file. If this function is emitting signals and changing pcb's state, this + is a bug. Fortunately, this appears not to be the case, so the + effect of this commit is to eliminate one more use of + ghidgui->toggle_holdoff. + +2011-08-31 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c: gtk: sync visiibility of layer + selector with core state in LayersChanged + +2011-08-31 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c, + src/hid/gtk/ghid-layer-selector.h: Use signal blocking for + visibility toggling in GHidLayerSelector + +2011-08-31 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-config.c: Add call to + ghid_layer_buttons_color_update() when loading new colors + +2011-08-30 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/change.c: Change change.c to treat text scale as mils + +2011-08-30 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: Configure layer selector to + only accept left-clicks Suggested by Kai-Martin Knaak, seconded by me. + +2011-08-30 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c: Fix invalid free of ~/.pcb/filename + path in gui-top-window.c + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c, + src/hid/gtk/ghid-layer-selector.h: minor: fix comment and forward + declaration in ghid-layer-selector + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: Remove default layer selection + from ghid-layer-selector.c Having the layer selector select its own first layer is not needed - + pcb does this for us, after making the widget. It's not the sort of + decision a widget should be making on its own, anyway. + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: Use g_signal_handler_block + instead of flags in ghid-layer-selector.c Thanks to Peter C. for this code-cleanliness tip. Now the two + layer-selection interfaces (menu button and selector widget) set + each other's GUI state but do not raise any signals past the + original. + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: Add missing free_ldata() in + ghid-layer-selector.c + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-command-window.c: Disable layer selector's + GtkAccelGroup while in command mode + +2011-08-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Add const qualifiers to some BoxType + *drawn_area parameters + +2011-08-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/misc.c, src/misc.h: misc.c: Add const qualifier to BoxType * + parameter passed to CountHoles + +2011-08-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Fold DrawLayerCommon() into DrawLayer() Since the last commit, DrawLayer() just calls DrawLayerCommon with + the "clear_pins" argument set to true. The only other + DrawLayerCommon caller passes clear_pins as true, so having + functions is redundant. + +2011-08-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: DrawLayer(): Pass true to clear_pins of + DrawLayerCommon This should not affect any rendering. If the check planes flag is + set, we should only draw polygons, nothing more. Only a handful of + cases draw layers via this code-path, and in all but the exporter + cases, they are not called if CHECKPLANES is set. The exporters which call DrawLayer explicitly clear the CHECKPLANES + flag (since commit 3c01bd38cb59922692408b71cd5d77892dbe6ade), so + nothing should be affected by this argument change. + +2011-08-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gerber/gerber.c, src/hid/ps/eps.c, src/hid/ps/ps.c: + hid/{ps,eps,gerber}: Clear CHECKPLANESFLAG before exporting Ensure we are in a sensible view state before exporting. This update + those HIDs which cleared other similar renedering flags before + exporting to include the CHECKPLANES flag. + +2011-08-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Have DrawLayerGroup() call DrawPPV for non-gui + exporters This means DrawLayerGroup() can have a void return type as most of + the other drawing functions, and makes things a little neater. Only the GUI renderers special case the pin / pad / via to wait + until a later rendering oass than the layers they reside on. + +2011-08-29 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Remove unused "button" + parameter from Popup function. Remove the dead code and comments refering to the fact the + function's second argument indicates a mouse button number. + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c, + src/hid/gtk/ghid-layer-selector.h, src/hid/gtk/ghid-main-menu.c, + src/hid/gtk/ghid-main-menu.h, src/hid/gtk/gui-top-window.c: Link + GHidLayerSelector and GHidMainMenu Layer visibility-toggle and selection menu items now appear in the + main menu. Accelerators work correctly and are reassigned on + deletion/addition of layers to simulate the old behavior. + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: Clean up layer data handling in + ghid-layer-selector.c + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c: Give GHidLayerSelector an + internal layer structure Before we had various arrays to resize and index; now each row has a + structure associated with it, that is easier to access and maintain. + +2011-08-28 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-command-window.c, + src/hid/gtk/gui-output-events.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: Replace gtk UI manager with GHidMainMenu widget This commit replaces the old UI manager with a customize gtk widget + that builds menus directly from a resource tree. This eliminates the + translate-to-XML step, the ugly hacks used to access individual + actions, and all the associated manual memory management. This will also give us the ability to have more dynamic menus, in + particular layer lists without maximum capacities. Layers and route styles are still not hooked into the menu. This + means that those accelerators DO NOT WORK. (This will be fixed in a + later commit.) Checkboxes have been replaced with radio buttons + where appropriate. There are now tearoffs on the context-menu's + submenus. Other than that, there should be no user-visible changes. ;) + +2011-08-28 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/Makefile.am, src/hid/gtk/ghid-main-menu.c, + src/hid/gtk/ghid-main-menu.h: Created ghid-main-menu.[ch] Still need to hook up layer selector and route styles. + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c: Fix select-hidden-layer behavior When you select a hidden layer, it should toggle the visibility so + that the currently-selected layer is always visible. We were + toggling twice. + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/ghid-layer-selector.c, src/hid/gtk/gui-top-window.c: + Prevent recursion in layer selector events + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/Makefile.am, src/hid/gtk/ghid-coord-entry.c, + src/hid/gtk/ghid-coord-entry.h, src/hid/gtk/gtk-pcb-coord-entry.c, + src/hid/gtk/gtk-pcb-coord-entry.h, src/hid/gtk/gui-config.c, + src/hid/gtk/gui-dialog-print.c, src/hid/gtk/gui-dialog-size.c, + src/hid/gtk/gui-utils.c, src/hid/gtk/gui.h: Rename GtkPcbCoordEntry + to GHidCoordEntry + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/Makefile.am, src/hid/gtk/ghid-layer-selector.c, + src/hid/gtk/ghid-layer-selector.h, + src/hid/gtk/gtk-pcb-layer-selector.c, + src/hid/gtk/gtk-pcb-layer-selector.h, src/hid/gtk/gui-top-window.c: + Rename GtkPcbLayerSelector to GHidLayerSelector + +2011-08-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/Makefile.am, src/hid/gtk/ghid-cell-renderer-visibility.c, + src/hid/gtk/ghid-cell-renderer-visibility.h, + src/hid/gtk/gtk-pcb-cell-renderer-visibility.c, + src/hid/gtk/gtk-pcb-cell-renderer-visibility.h, + src/hid/gtk/gtk-pcb-layer-selector.c: Rename + GtkPcbCellRendererVisibility to GHidCellRendererVisibility + +2011-08-28 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/gpcb-menu.res.in: Add mnemonics to menus in default + gpcb-menu.res.in You can now access the main menu without a mouse, by doing Alt+F, + for example, to select the File menu. + +2011-08-27 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/common/hid_resource.c, src/hid/common/hid_resource.h, + src/hid/gtk/gui-top-window.c, src/res_parse.y, src/resource.h: gtk: + Const-correct add_resource_to_menu and related functions Five files have had const keywords added: ../common/hid_resource.c ../common/hid_resource.h gui-top-window.c ../../res_parse.y ../../resource.h No casts were added. No compilation warnings were added. + +2011-08-27 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtk-pcb-layer-selector.c: Delete GtkAction along with + layer in gtk-pcb-layer-selector.c + +2011-08-29 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/ps/eps.c: hid/ps/eps.c: Remove assigned by unused + lastgroup variable + +2010-10-21 Markus Hitter * mah AT jump-ing dot de * + + * src/hid/gcode/gcode.c: HID-gcode: make use of MAXPATHLEN. Affects-bug: lp-699497 + +2011-08-28 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/bom/bom.c, src/hid/gerber/gerber.c, src/main.c: Add + attributes to docu for commandline options + +2011-08-28 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/pcb.texi: Docu: Fix some references to command-line options and remove the documentation for a non-working X11-Interface option. + +2011-08-28 Dima Kogan * dkogan AT cds dot caltech dot edu * + + * src/find.c: Better handling of unplated vias The attached patch adds checks in the geometry intersection + functions to no longer treat unplated vias (mounting holes) as + conducting. The implementation in the patch will act as if the + unplated via doesn't intersect with metal objects at all, which is + possibly not what is desired. Should the conductivity check happen + on a higher level from the geometry intersection routines? A case + that would require this is not obvious to me. Closes-bug: lp-699499 + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gcode/gcode.c, src/hid/gerber/gerber.c, + src/hid/lpr/lpr.c, src/hid/nelma/nelma.c, src/hid/png/png.c, + src/hid/ps/ps.c: Unify HID description (no fullstop at end of + description) Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/ps/ps.c: Add docu for ps HID commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/ps/eps.c: Add docu for eps HID commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/png/png.c: Add docu for png HID commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/nelma/nelma.c: Add docu for nemla HID commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/lpr/lpr.c: Add docu for lpt HID commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gerber/gerber.c: Add docu for Gerber HID commandline + options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/bom/bom.c: Add docu for the BOM HID commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gtk/gui-top-window.c, src/hid/lesstif/main.c: Add docu for + commandline-options for GTK+ and lesstif GUI Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-18 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/main.c: Add docu for DRC commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-18 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/main.c: Add docu for general gui commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-18 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/main.c: Add docu for path commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-18 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/main.c: Add docu for commandline commands Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-18 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/main.c: Add docu for layer names commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-18 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/main.c: Add docu for size commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-18 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/main.c: Add docu for color commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-28 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/pcb.texi, src/main.c: Docu: Add general description for + commandline options ... and for general options. (Patch 3/19 of this patch-serie is + missing on purpose) Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-28 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/pcb.texi: Remove out-dated docu for commandline options Most parts of this patch-serie was written by Kai-Martin Knaak. + Adaption to actual git HEAD and some modifications by Felix Ruoff. + +2011-08-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c, src/misc.c, src/misc.h: Move CountHoles() from draw.c + to misc.c and export it This function may be more generally useful. + +2011-08-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Move doing_assy flag assignment into + PrintAssembly() Keeps things tidier + +2011-08-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gcode/gcode.c, src/hid/nelma/nelma.c: hid/{nelma,gcode}: + Remove assigned but unused variables lastcap and lastgroup + +2011-08-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.h, src/main.c: Remove traces of LoadBackgroundImage() + from the core of PCB + +2011-08-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c: hid/gtk: Use + view_data struct to simplify saving and restoring views + +2011-08-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: hid/gtk: + Encapsulate view parameters in a structure + +2011-08-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Remove unnecessary prototype + +2011-08-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui.h: hid/gtk: crosshair_{x,y} should be Coord, not + int. + +2011-08-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/fontmode.c: fontmode.c: Add missing #include "pcb-printf.h" + +2011-08-26 DJ Delorie * dj AT delorie dot com * + + * src/fontmode.c: Fix FontEdit() Move top/bottom meta-layers to layers 0 and 1 so they'll exist after + we trim out the layers. Set up DRC values to avoid interfereing + with the font layout. Closes-bug: lp-808591 + +2011-08-26 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/dialogs.c: Use correct units when setting up the + Sizes dialog. Replace %mm with %mS so it auto-selects units, to match the scanning + that's done when you save the settings. + +2011-08-26 DJ Delorie * dj AT delorie dot com * + + * src/parse_l.l: Avoid segfault tmp-saving partial board. Check for both PCB and PCB->Data to avoid trying to save a backup + copy of a partially created layout. + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c: gtk: Sync selection with pcb state + in ghid_layer_buttons_update It was possible for PCB's active layer to come out of sync with the + selected entry in the layer selector. This fixes that. + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtk-pcb-layer-selector.c, + src/hid/gtk/gtk-pcb-layer-selector.h, src/hid/gtk/gui-top-window.c: + Support adding/deletion of layers in GtkPcbLayerSelector If you add a layer to a GtkPcbLayerSelector, and its ID is already + in the selector, it will update the layer instead of adding a new + one. This way, we can update the layer selector by: 1. Deleting all recently-deleted and non-copper layers. 2. Re-adding all layers (including new ones) 3. Re-adding all non-copper layers (so they go to the end) The old layer selector maintained MAX_LAYER + n layers (where n was + the number of non-copper layers), and showed/hid the gui widget to + managed deletion and adding of layers. The new one has no notion of + MAX_LAYER, nor does it care whether a layer is copper or not. :) + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-drc-window.c: hid/gtk: Fix DRC preview pixmap + rendering Another hard-coded constant in the old PCB coordinate system + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c: hid/gtk: Remove duplicated render pass + in ghid_pinout_preview_expose() This looks like it was a copy+paste error. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-pinout-preview.c, + src/hid/gtk/gui-pinout-preview.h: hid/gtk: Fix pinout preview + default zoom after unit conversion Apparently the scale factor equation was dependant on the old PCB + units of 100th mils to produce a sensible zoom level. Since this code is monumentally obtuse, just re-write something + completley new. The old code probably bit-rot when we split out the + rendering widget. Lets just suggest a fixed size of 100 pixels natural size for each + 150 mil of element bounding box. That seems to work nicely. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/misc.c: misc.c: Rework SetTextBoundingBox() to make it more + clear how it works. Add lots of comments, change the coding style and rename variables + to make them more obvious. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: Redefine pin / pad name label text size in terms of + FONT_CAPHEIGHT This reduces the proliferation of various "magic numbers" which + combine constants from several sources and aren't appearent why they + are a particular number. There is a slight rounding error in the + converted pin label size, but it is insignificant. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * globalconst.h, src/change.c, src/report.c: Introduce global + #define for the text cap-height of the PCB font. This should save the proliferation of rather opaque + MIL_TO_COORD(45)'s in various places. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/change.c, src/draw.c, src/report.c: Fix some text scale + factors This commit fixes pin / pad name drawing, the pinout preview and two + actions which change the size of text based on user input. To recap: Text->Scale is a percentage scaling (from the font definition). The + default font has has an approximate cap-height of 45-50 mils, and + PCB assumes this to be the case. Text->Scale is not a Coord, it is an integer, so use int as the + resulting type for any calculations involving this number. (100% is + stored as 100 in Text->scale). Code which scales text based upon + other object sizes does so by dividing to a dimensionless scale + factor. We may have to be careful about the width of intermediate + results when scaling based on Coords if Coord is changed to 64bit at + some point. ChangeTextSize() and ChangeElementNameSize accept absolute (or + delta) sizes in units of distance. These are converted to a Scale by + assuming a 100% scaled font is 45mils high. YMMV. Oh - and just to note.. the line-thickness is drawn at half the + width stored in the font definition. This is clearly bonkers, but we + would break designs if we changed it now. Grr. (Thanks a bunch + commit 66592387176ba2578dfc14023a6fe49226f3a3df). + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/hid/ps/ps.c: action.c: Fix missing #include + "mirror.h" + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * : hid/ps: Fix inaccurate comment and twiddle some whitespace The whitespace changes in the if statement were from an earlier + revision which actually had functional changes - but I prefer this + way, so I'm committing it anyway. Also adds some != 0 to the end of strcmp tests, as I believe this + aids clarity by reminding readers strcmp returns 0 for a match. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-output-events.c: + hid/gtk: Allow zooming out past the board size (up to 1/10 viewport + size) The 1/10 viewport size should be the same as the Lesstif HID allows. + The purpose of the limit is to avoid zooming in so small the PCB is + lost as a tiny dot, and also to avoid coodinate overflows when + representing screen coordinats in PCB Coords. (Since we switched to + nanometers, this could potentially raise its head more readily until + we move to 64bit integers). The explicit pan fixup added to ghid_view_zoom_fit() is required as + pan_common() no longer clamps the view back to the origin. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui.h: hid/gtk: Remove ghid_port_ranges_pan for new + replacement ghid_pan_view_rel ghid_pan_view_rel() does less heavy lifting directly, sharing common + code with the other view altering routines for zooming and panning. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui.h: hid/gtk: Remove prototype for non-existant + ghid_port_ranges_update_ranges The functionality this prototype implies is in + ghid_port_ranges_scale(). + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Don't recompute view size in + PCB coords in ScrollAction() We aleady keep around the view size in PCB coords, so use it + directly. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Add fixup for stored + gport->pcb_{x,y} coords when changing view This updates the stored (in PCB coordinates) mouse pointer location + on the board as we perform a pan / zoom. This is mostly relevant to + panning and clipped zoom operations, as non-clipped zoom operations + aim to leave the mouse pointer at the same PCB coordinate anyway. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/polygon.c: polygon.c: Fix dicer to give up if the clipping + region passed is invalid. Most of the dance checking return codes from polyBoolean_free was + unnecessary, as it sets the output to NULL if there is a problem, so + remove that. Whilst we're at it, fix up some variable names to make + the operation of the function clearer. + +2011-08-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/polygon.c: polygon.c: Make RectPoly return NULL for zero or + negatively sized rectangles Previously we would hit an assertion failure, where we could + indicate the problem by returning NULL. I've hit an issue in which some expose events in the GTK (+GL) HID + are collapsing to a zero-width region on the PCB, and some code is + tripping up on the bad clip polygon produced using RectPoly on the + coordinates. This causes segfaults in the branch which contains + code to clip rendering of the soldermask at the board outline. We could (and perhaps should) test in the expose handler, but the + failure mode here is not ideal. Since most builds of PCB run with + asserts disabled, the asserts are not hit here and a bad polygon is + silently gets created with no contours. This upsets the polygon + algebra routines somewhat, but returning a NULL (empty) polygon + would be fine. + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-config.c, src/hid/gtk/gui-top-window.c: gtk: + remove call to ghid_layer_buttons_color_update The call to ghid_layer_buttons_color_update() in config_read() is + now unnecessary; the Gtk layer selection widget does not exist, nor + do the PCB struct's colors need to be synced with the ones in the + Settings struct. So this call makes no sense. Oh, and it causes a segfault. Also: remove color-changing debug code from gui-top-window.c + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtk-pcb-coord-entry.c: Add doxygen comments to + gtk-pcb-coord-entry.c No code changes. + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtk-pcb-cell-renderer-visibility.c, + src/hid/gtk/gtk-pcb-layer-selector.c: Add doxygen comments to + gtk-pcb-cell-renderer-visibility.c Also fix the file description for gtk-pcb-layer-selector.c. No code + changes. + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/pcb-printf.c: Add doxygen comments to pcb-printf.c No code changes. + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/flags.c: Fix const-correctness warning in flags.c + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * globalconst.h: Make EMARK_SIZE unit-agnostic Closes-bug: lp-832455 + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: Use + GtkPcbLayerSelector in gtk GUI Closes-bug: lp-699482 + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/Makefile.am, src/hid/gtk/gtk-pcb-cell-renderer-visibility.c, + src/hid/gtk/gtk-pcb-cell-renderer-visibility.h, + src/hid/gtk/gtk-pcb-layer-selector.c, + src/hid/gtk/gtk-pcb-layer-selector.h: Introduce GtkPcbLayerSelector + widget -- not used yet This widget will replace the layer-selection buttons in the Gtk GUI, + as well as the layer selection and visibility-toggling parts of the + menu. This is to make layer manipulation more consistent and more + keyboard-accessible. In future, it would be good to update this widget with context menus + with things like "hide all but this layer". + +2011-08-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c: Change Gtk layer_process() to use + colors from Settings, not PCB Now the only code that uses the colors in the PCB struct is draw.c. + Hopefully in a future commit we can remove this too and remove the + duplication of color data in the Settings and PCB structs. + +2011-08-25 DJ Delorie * dj AT delorie dot com * + + * src/action.c: Fix File->Import for elements on back side. Mirror pasted footprints when replacing back-side elements. Also + clear element cache when reloading the new footprint, to avoid + getting a stale pointer. Closes-bug: lp-699331 + +2011-08-25 DJ Delorie * dj AT delorie dot com * + + * src/report.c: Fix texinfo bug in report.c patch {} are special characters in texinfo + +2011-08-25 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/main.c: Lesstif: force widget update on grid unit + change If the grid units change, force a redraw of the coordinates window + and allow a resize. + +2011-08-25 DJ Delorie * dj AT delorie dot com * + + * src/flags.c, src/hid/common/flags.c: Fix unitless menu flags. Numbers without units are counting numbers in flags, not cmil. + Also, cache the lookup of units in flags.c + +2011-08-24 Bert Timmerman * bert dot timmerman AT xs4all dot nl * + + * src/report.c: This patch adds support for doing + Report(netlength,net_name) Affects-bug: lp-699451 Updated patch to nanometers, fixed a few minor bugs, applied. + +2011-08-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Don't compensate for crosshair + position when panning Perhaps this was necessary before.. it is not now, and is causing + the crosshair to be errenously offset whilst panning with the scroll + wheel. + +2011-08-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Simplify viewport setup in + PCBChanged() This version still works ;) + +2011-08-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Refactor common view clamping + code from ghid_{pan,zoom}_view_abs Inspection of the zoom-fit code which triggers if the view exceeds + the size of the board suggests that it will never be called, so + remove it. + +2011-08-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-output-events.c: hid/gtk: A couple of NOOP + cosmetic changes to ghid_port_ranges_pan() + +2011-08-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c: hid/gtk: Don't + render of soldermask outside board area + +2011-08-22 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/create.c: Fix negative-angle handling in create.c This bug could be seen by taking a component with an arc (say, a + 3-pin TO transistor, with curved silk), flipping it with 'b', and + trying to move it. The arc would be inverted. + +2011-08-22 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/report.c: Fix segfault in report.c text report output + +2011-08-22 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui.h: hid/gtk: Remove emit_changed parameter from + ghid_port_ranges_scale. The one caller which passed TRUE, PCBChanged () also immediately + aftwewards calls ghid_port_ranges_pan(), which will take car of any + changes necessary. + +2011-08-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Rework view flip code + +2011-08-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui.h: hid/gtk: Rework zoom + / pan API + +2011-08-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Some NOOP and whitespace + changes to the SwapSides() function Split from of a later patch which reworks the view flipping APIs. + Hopefully this makes the function a little simpler. + +2011-08-19 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c: hid/gtk: + Convert line width to Coord units in renderer GC structs. + +2011-08-19 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/find.c: find.c: Remove unused variables in LineLineIntersect() + +2011-08-15 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/main.c: Add --help and -? to options that will dump usage() + without loading GUI Closes-bug: lp-826931 + +2011-08-15 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/batch/batch.c: Fix compilation warnings in + hid/batch/batch.c + +2011-08-15 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtk-pcb-coord-entry.c, src/hid/gtk/gui-dialog-print.c: + Fix: spin increments not working in GtkPcbCoordEntry after unit + change + +2011-08-15 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-config.c: Parse options of type CONFIG_Coord in + preferences file + +2011-08-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * globalconst.h, src/const.h, src/global.h, src/main.c: *** CONVERT + PCB'S BASE UNITS TO NANOMETERS *** Convert base units to nm, change Coord from int to long, change + LARGE_VALUE from a magic number to (LONG_MAX / 2 - 1). Fixes-bug: lp-772027 + +2011-08-11 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/const.h: Make MARK_SIZE base-unit-agnostic + +2011-08-10 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtk-pcb-coord-entry.c: Implement "change unit" submenu + of GtkPcbCoordEntry context menu + +2011-08-10 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-dialog-print.c, src/hid/ps/ps.c: Use + GtkPcbCoordEntry in gui-dialog-print.c Also set ps-bloat to HID_Coord from HID_Integer in ps.c + +2011-08-10 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtk-pcb-coord-entry.c, + src/hid/gtk/gtk-pcb-coord-entry.h, src/hid/gtk/gui-config.c, + src/hid/gtk/gui-dialog-size.c, src/pcb-printf.c, src/pcb-printf.h: + Use GtkPcbCoordEntry in gui-dialog-size.c + +2011-08-10 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/Makefile.am, src/hid/gtk/gtk-pcb-coord-entry.c, + src/hid/gtk/gtk-pcb-coord-entry.h, src/hid/gtk/gui-config.c, + src/hid/gtk/gui-utils.c, src/hid/gtk/gui.h: Introduce + GtkPcbCoordEntry widget, use it in gui-config.c The GtkPcbCoordEntry is a modified spinbox that handles pcb units + internally and outputs them as human units. It uses the step sizes + given in pcb-printf and adjusts automatically when units are + changed. If you manually change the unit suffix, it will change its interal + unit, so that if you change "10mil" to "10mm" it will do the right + thing. TODO: handle overflows add a unit selector to the context menu + +2011-08-07 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/common/hidgl.c, src/hid/common/hidgl.h, + src/hid/gtk/gtkhid-gl.c: Audit hidgl stuff, implement Coord I did not touch any code, only change 'int' to Coord where + appropriate (and in a couple cases 'double' to Coord), under the + assumption that any real changes should be done by Peter C. + +2011-08-07 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid.h, src/hid/common/hidinit.c, src/hid/gtk/gui-config.c, + src/hid/gtk/gui-dialog-print.c, src/hid/lesstif/dialogs.c, + src/hid/lesstif/lesstif.h, src/hid/lesstif/main.c, src/main.c: + Introduce HID_Coord type and related changes Give measure-specific HID options their own datatype, so that things + like the --grid option can support suffixes instead of exposing the + base unit. (In fact, since they use GetValue, they will keep right + on pretending the base unit is cmil.) This gives us the opportunity to write measure-entry GUI widgets + that will handle units correctly and whatnot, though I have not yet + done this. Fixes-bug: lp-699640 Fixes-bug: lp-699641 + +2011-08-11 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/lesstif/dialogs.c: Change lesstif_logv to use pcb-printf + [rebase-after: audit lesstif] + +2011-08-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/global.h, src/gpcb-menu.res.in, src/hid/lesstif/dialogs.c, + src/hid/lesstif/main.c, src/hid/lesstif/styles.c, + src/pcb-menu.res.in: Audit lesstif HID We can now remove LocationType and BDimension! This marks the + completion of the code audit. Remaining to do is the conversion and + test. + +2011-08-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gui-log-window.c, src/hid/gtk/gui-misc.c, + src/hid/gtk/gui-output-events.c, src/hid/gtk/gui.h: Audit Gtk HID + +2011-08-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/common/draw_helpers.c, src/hid/common/extents.c, + src/hid/common/hidnogui.c: Audit HID nogui/common code + +2011-08-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/nelma/nelma.c: Audit nelma HID + +2011-08-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/png/png.c: Audit png HID + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gcode/gcode.c: Audit gcode HID + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/ps/ps.c: Audit ps.c + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/ps/eps.c: Audit eps.c + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: Audit gerber HID + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/bom/bom.c: Implement new unit selector in BOM HID, audit + bom.c + +2011-08-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid.h, src/hid/bom/bom.c, src/hid/common/hidinit.c, + src/hid/gcode/gcode.c, src/hid/gerber/gerber.c, + src/hid/gtk/gui-config.c, src/hid/gtk/gui-dialog-print.c, + src/hid/gtk/gui-utils.c, src/hid/gtk/gui.h, src/hid/lpr/lpr.c, + src/hid/nelma/nelma.c, src/hid/png/png.c, src/hid/ps/eps.c, + src/hid/ps/ps.c, src/main.c: Introduce HID_Unit option type + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid.h: Change drawing function coords in hid.h to Coord from + int Note that this causes a slew of compilation warnings about + mismatched pointer types, since the HIDs themselves are still using + int-taking functions. These warnings will be cleaned up over the + next few commits. + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/crosshair.c, src/crosshair.h: Audit crosshair.[ch], implement + Coord + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/parse_y.y: Audit parse_y.y, implement Coord + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/mtspace.c, src/mtspace.h: Audit mtspace.[ch], implement Coord + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/pcb-printf.h, src/report.c: Audit report.c, implement Coord Includes fixes for the original pcb-printf conversion: Fix drill report spacing in report.c Use %ma spec outputting angles in report.c + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/autoroute.c: Audit autoroute.[ch], implement Coord There are many magic numbers in this file. It is likely they will be + skewed by base-unit changes, though I have worked to mitigate this. + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/autoplace.c: Audit autoplace.c, implement Coord Note that there are -many- magic numbers in this file. I believe + I've caught all of them that are supposed to be unit conversions and + used macros instead. + +2011-08-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/action.c, src/create.c, src/create.h: Audit create.[ch], + implement Coord + +2011-08-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/intersect.c, src/line.c, src/line.h: Audit line.[ch], + intersect.c, implement Coord + +2011-08-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/find.c, src/find.h: Audit find.[ch], implement Coord Note that this commits brings major simplifications to some DRC + functions. My tests show everything okay, but there will likely be + some bugs (or bug fixes) as a result of this commit. + +2011-08-02 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/find.c: Remove fBloat from find.c fBloat does nothing except act as a floating point copy of the + integer Bloat variable. It should not be (and is not) necessary. + +2011-08-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/find.c: Fix g_string_free (NULL) error + +2011-08-02 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/global.h, src/hid/gtk/gui-drc-window.c, + src/hid/gtk/gui-drc-window.h: Remove coord suffix/precision from DRC + error struct Display units for DRC errors are now handled by the UI, rather than + in the error struct. The struct now stores everything in Coord's, + and pcb-printf worries about how to display them. + +2011-08-02 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/file.c: Audit file.c, implement Coord + +2011-08-02 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/find.c, src/pcb-printf.c, src/pcb-printf.h: Use pcb-printf in + DRC code in find.c Also, expose pcb_vprintf in pcb_printf.h. + +2011-07-27 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/draw.c, src/draw.h: Audit draw.[ch], implement Coord + +2011-07-27 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/box.h, src/change.c, src/change.h: Audit change.[ch], box.h, + implement Coord + +2011-07-27 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/copy.c, src/copy.h, src/insert.c, src/insert.h, src/mirror.c, + src/mirror.h: Audit copy.[ch], insert.[ch], mirror.[ch], implement + Coord + +2011-07-27 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/misc.c, src/misc.h: Audit misc.[ch], implement Coord + +2011-07-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/move.c, src/move.h: Audit move.[ch], implement Coord + +2011-07-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/polyarea.h, src/polygon.c, src/polygon.h, src/polygon1.c: + Audit polygon*, polyarea.h, implement Coord + +2011-07-25 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/rotate.c, src/rotate.h: Audit rotate.[ch], implement Coord + +2011-07-19 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/search.c, src/search.h: Audit search.[ch], implement Coord + unit This does not affect the "IsPointOnArc assumes circular arc" bug; it + is just more obvious now with the cleaner code. Affects-bug: lp-815527 + +2011-07-13 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/rubberband.c, src/set.c, src/set.h, src/thermal.c, + src/undo.c, src/undo.h: Audit undo.[ch], thermal.c, set.[ch], + rubberband.c, introduce Coord + +2011-08-07 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/action.c, src/buffer.c, src/buffer.h, src/command.c, + src/djopt.c, src/djopt.h, src/fontmode.c, src/global.h, src/hid.h, + src/hid/batch/batch.c, src/hid/common/actions.c, + src/hid/common/hidnogui.c, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui-log-window.c, src/hid/gtk/gui-netlist-window.c, + src/hid/gtk/gui-output-events.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h, src/hid/lesstif/dialogs.c, + src/hid/lesstif/lesstif.h, src/hid/lesstif/library.c, + src/hid/lesstif/main.c, src/hid/lesstif/menu.c, + src/hid/lesstif/netlist.c, src/hid/lesstif/styles.c, src/misc.c, + src/move.c, src/netlist.c, src/puller.c, src/report.c, + src/toporouter.c, src/vendor.c: Change get_coord and action + signatures to use Coord + +2011-07-27 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/file.c, src/hid/gtk/gtkhid-main.c, src/hid/lesstif/main.c: + Introduce PCB::grid::unit attribute This is PCB's first use of the Attribute() field in the file format. + It is a unit suffix string denoting the unit setting used by pcb + when loading the file. Note the namespacing: as Attributes are persistent across + file-saves, other programs may use them in future for purposes + unknown and irrelevant to pcb. Therefore we will put all pcb + attributes under the PCB namespace. If this attribute is missing or invalid (i.e., the unit given is + unsupported by pcb-printf), PCB will then use the --grid-units + command-line option. Failing that, it will use the grid-units entry + in ~/.pcb/preferences. Failing that, it will use mils. Fixes-bug: lp-811393 + +2011-08-10 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/pcb-printf.c: Modify get_unit_struct()'s bad-unit forgiveness Suffixes passed to get_unit_struct() may now start or end with + whitespace, without affecting the result. However, incomplete units + will NOT be matched. This means that "mi" will no longer return the "mil" struct, for + example. The reasons for this change are: 1. The old behavior returned the first potential match, regardless of other matches: "c" is always "cm", never "cmil". 2. Prevent surprises (due to point #1, or typos). 3. Prevent user dependence on behavior that will change as units are added or removed. It still supports plural units, like "inches" or "mils". However, + it will read "miles" as "mil" because of this. ;) + +2011-08-05 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/main.c, src/pcb-printf.c, src/pcb-printf.h: Add alias support, + get_unit_list() to pcb-printf Add pcb-printf support for unit aliases (just one per unit for now, + we will fix this if the need arises). Map "inch" to "in" and "pcb" + to "cmil" for backward compatibility. Move initialize_units() call to main.c to ensure it is called before + any other unit-handling code. Also, add the functions get_unit_list (); get_n_units (); which do exactly what they look like. These will + be used to build HID-export unit selectors. + +2011-07-12 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/gpcb-menu.res.in, src/pcb-menu.res.in: Use suffixed units in + gpcb-menu.res and pcb-menu.res + +2011-07-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/buffer.c, src/buffer.h, src/create.c, src/file.c, + src/global.h, src/misc.c, src/misc.h, src/pcb-printf.c, + src/pcb-printf.h, src/rotate.c: Make file.c use %mr pcb-printf spec I have changed the %mr spec to always output cmils, no suffix, and + changed file.c to use this. The reason is that the %mc spec (cmils, + no suffix) is locale- dependent, while %mr is not. When we change the actual file format, file.c can be left alone and + the relevant changes should be done to the %mr spec in pcb-printf. + +2011-07-13 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-config.c: Update hid/gtk/gui-config.c with new + grid preferences + +2011-07-13 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/file.c, src/find.c, src/flags.c, src/global.h, + src/gpcb-menu.res.in, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui-config.c, src/hid/gtk/gui-dialog-size.c, + src/hid/gtk/gui-misc.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h, src/hid/lesstif/dialogs.c, + src/hid/lesstif/main.c, src/hid/lesstif/styles.c, + src/pcb-menu.res.in, src/pcb-printf.h, src/report.c: Remove mm/mil + dichotomy, support arbitrary user units Currently, pcb assumes the user's display units are either mm or + mil, and uses the Settings.grid_unit_mm boolean (and flag + "grid_unit_mm") to determine which is which. This patch removes the boolean and replaces it with the new + Settings.grid_unit, which can be set to any unit supported by + pcb-printf. The user-visible interface has not changed (there is + still a mm/mil toggle in Gtk and the menus only contain mm and mil + units), but new units can be accessed though the :SetUnits command. The flag is still there and can be used in pcb-menu.res as usual. + However, the new flag "grid_unit_mil" should be checked to see if + mils are selected, since this is no longer implied by grid_unit_mm + == 0. There will be some user-visible changes to the precision of + displayed values, since I have removed a lot of special-case code + for this sort of this thing and use the default_prec of applicable + units instead. Because of the new flexibility, some idioms have been changed: Settings.grid_unit_mm ? COORD_TO_MM (x) : COORD_TO_MIL (x) becomes coord_to_unit (Settings.grid_unit, x) Settings.grid_unit_mm ? "mm" : "mil" becomes Settings.grid_unit->suffix Settings.grid_unit_mm = 1; becomes Settings.grid_unit = get_unit_struct ("mm"); For GUI use, the Unit structure returned by get_unit_struct exposes + certain members: suffix : "mm"/"mil"/etc in_suffix : i18n version of the above default_prec : precision used for spinboxes, labels, etc step_tiny : step_small : step_medium : step sizes for various spinboxes step_large : step_huge : Additionally, the *_increment_mm and *_increment_mil variables have + their own structure containing default, min and max values. These + can no longer be set on the command line. + +2011-07-12 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/main.c: Cleanup default values in main.c + +2011-07-12 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/misc.c, src/pcb-printf.c, src/pcb-printf.h: Introduce new + structures (unit, increment) to pcb-printf Constants for gui spinbox steps are now in pcb-printf.h: Unit.step_tiny Unit.step_small Unit.step_medium Unit.step_large Unit.step_huge Additionally, the default/max/min values for the preferences + Increments tab are in their own structure in pcb-printf.h. These changes are needed to bring all unit-specific constants into + one place. The spinbox values can be shared by gtk and lesstif. + +2011-07-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/misc.c, src/pcb-printf.c, src/pcb-printf.h: Add scale factor + lookups to pcb_printf.c, tell GetValue to use them GetValue and pcb-printf have their own lookup tables to determine + scale factors. To unify them, this patch adds two functions to pcb- + printf, coord_to_unit and unit_to_coord. These a const char *suffix and return an appropriate scale factor. I have also added a NO_PRINT entry to the allow_mask array for + suffixes like "inch" that we can read but never output. The definitive unit lookup table should now be in pcb_printf.c. Any + other tables used in the code should be merged into this. + +2011-07-11 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/action.c, src/autoplace.c, src/crosshair.c, src/crosshair.h, + src/djopt.c, src/file.c, src/flags.c, src/fontmode.c, src/global.h, + src/hid/common/hidgl.c, src/hid/gtk/gtkhid-gdk.c, + src/hid/gtk/gui-config.c, src/hid/gtk/gui-misc.c, + src/hid/gtk/gui.h, src/hid/lesstif/main.c, src/hid/lesstif/menu.c, + src/main.c, src/misc.c, src/misc.h, src/set.c, src/set.h: Convert + grid/increments from double to Coord Since Coord is an integer unit, there will be (often severe) + precision errors until we convert the base unit to nm. + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/global.h: Remove unused variable + +2011-08-14 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/global.h, src/main.c: Remove broken --menu-file option The expected functionality is given by the option --pcb-menu for the + GTK+ GUI and lesstif GUI. + +2011-08-13 DJ Delorie * dj AT delorie dot com * + + * src/change.c, src/find.c, src/global.h, + src/hid/common/draw_helpers.c, src/misc.c, src/polygon.c, + src/search.c: Make toggling the HOLE flag reversible Closes-bug: lp-699483 When toggling the HOLE flag, the Thickness is no longer changed. + Instead, use PIN_SIZE() to select from Thickness or DrillingHole + accordingly, and use that throughout. Mask size is handled thusly: For tented vias, the mask is opened up + to just over the hole size. For untented vias, the mask gap is held + constant. Also, various minor changes to ensure that untented holes are drawn + correctly. + +2011-08-13 Jared Casper * jaredcasper AT gmail dot com * + + * src/action.c, src/create.c, src/create.h, src/file.c, src/main.c, + src/parse_y.y: refdes labels in new layout can't be moved. The .pcb file that gsch2pcb creates does not have a font in it. + When loading files, the bounding box for all the text is calculated + as the file is read. In the case that there is no font, this is + before the default font is installed, so the bounding box is way too + small. This patch remedies this by making all new PCB structures contain + the default font by calling CreateDefaultFont in CreateNewPCB + (CreateDefaultFont now takes in a PCBTypePtr instead of using the + global PCB). Previously, each time CreateNewPCB was called, + CreateDefaultFont was called soon thereafter. In the case of loading a PCB from a file. The default font in the + newly created struct PCB is marked invalid but not removed. If the + .pcb file contains a font, the default font will be overwritten by + the file's font. If it does not, PCB->Font will still be invalid + after LoadPCB, a message is displayed that the default font is being + used, and PCB->Font.Valid is set to true. Also fixes a related bug where the memory for a symbols lines wasn't + being cleared when a new file was brought into place. Previously, + this only happened if a new Font was loaded into an existing PCB. + Now the font will be replaced every time a file with symbol + information is loaded. Rebased to actual git-head by Felix Ruoff Closes-bug: lp-699478 + +2011-08-13 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/dialogs.c, src/hid/lesstif/lesstif.h, + src/hid/lesstif/library.c, src/hid/lesstif/main.c, + src/hid/lesstif/menu.c, src/hid/lesstif/netlist.c, + src/hid/lesstif/styles.c: Centralize Lesstif XmStringCreate* Closes-bug: lp-699472 To save time in the future, all XmString creation is done via + XmStringCreatePCB which is a macro in lesstif.h. Meanwhile, this + macro is defined to XmStringCreateLtoR instead of + XmStringCreateLocalized. + +2011-08-13 Cesar Strauss * cstrauss AT not2005 dot cea dot inpe dot br * + + * Makefile.am, README.w32, configure.ac, w32/.gitignore, + w32/Makefile.am, w32/README, w32/build-all.sh, w32/minipack.conf, + w32/mpk, + w32/patches/gd/0001-Export-sysbols-when-building-as-a-DLL.patch, + w32/patches/gd/0002-Libtool-requires-no-undefined-to-build-a-DLL.pa + tch, + w32/patches/gd/0003-Avoid-conflit-between-libjpeg-and-windows-heade + rs.patch, w32/patches/gettext/01-revert-sed-string.patch, + w32/patches/gettext/02-Avoid-missing-open-argument-error.patch, + w32/patches/gtk+/01-mousewheel.patch, + w32/patches/zlib/01-shared-lib-support.patch, + w32/patches/zlib/02-cross-build.patch, w32/recipes/atk.recipe, + w32/recipes/cairo.recipe, w32/recipes/gd.recipe, + w32/recipes/gettext.recipe, w32/recipes/glib.recipe, + w32/recipes/gtk+.recipe, w32/recipes/jpeg.recipe, + w32/recipes/libiconv.recipe, w32/recipes/libpng.recipe, + w32/recipes/pango.recipe, w32/recipes/pcb.recipe, + w32/recipes/pixman.recipe, w32/recipes/tiff.recipe, + w32/recipes/zlib.recipe, w32/tools/mpk-build, w32/tools/mpk-clean, + w32/tools/mpk-config.guess, w32/tools/mpk-help, + w32/tools/mpk-install, w32/tools/mpk-remove, w32/tools/mpk-shell, + w32/tools/mpk-source, w32/tools/mpk-unpack, w32/tools/mpk-version, + w32/tools/tool.template: Add Windows cross-build script. Closes-bug: lp-699494 + +2011-08-13 Cesar Strauss * cstrauss AT not2005 dot cea dot inpe dot br * + + * Makefile.am, README.win32, configure.ac, win32/.cvsignore, + win32/Makefile.am, win32/Readme.txt, win32/build_pcb, + win32/extract_gtk_win32, win32/pcb.nsi.in, + win32/registerExtension.nsh: Remove previous Windows build script. Affects-bug: lp-699494 + +2011-08-10 DJ Delorie * dj AT delorie dot com * + + * src/action.h, src/autoplace.h, src/autoroute.h, src/box.h, + src/buffer.h, src/change.h, src/clip.h, src/command.h, + src/compat.h, src/const.h, src/copy.h, src/create.h, + src/crosshair.h, src/data.h, src/dbus-pcbmain.h, src/dbus.h, + src/djopt.h, src/draw.h, src/edif_parse.h, src/error.h, src/file.h, + src/find.h, src/global.h, src/heap.h, src/hid.h, + src/hid/common/actions.h, src/hid/common/hid_resource.h, + src/hid/common/hidgl.h, src/hid/common/hidinit.h, + src/hid/common/hidnogui.h, src/hid/gcode/lists.h, + src/hid/gtk/gtkhid.h, src/hid/gtk/gui-drc-window.h, + src/hid/gtk/gui-library-window.h, src/hid/gtk/gui-pinout-preview.h, + src/hid/gtk/gui.h, src/insert.h, src/intersect.h, src/line.h, + src/lrealpath.h, src/macro.h, src/mirror.h, src/misc.h, src/move.h, + src/mtspace.h, src/mymem.h, src/parse_l.h, src/pcb-printf.h, + src/polyarea.h, src/polygon.h, src/print.h, src/rats.h, + src/remove.h, src/report.h, src/resource.h, src/rotate.h, + src/rtree.h, src/rubberband.h, src/search.h, src/select.h, + src/set.h, src/strflags.h, src/thermal.h, src/toporouter.h, + src/undo.h, src/vector.h, src/vendor.h: Fix header guard macro names Closes-bug: lp-699161 Make all headers use standard-compliant guard macro names. + +2011-08-10 DJ Delorie * dj AT delorie dot com * + + * configure.ac, src/hid/lesstif/main.c, src/hid/lesstif/xincludes.h: + Detect XRender + Xinerama to avoid BadMatch Closes-bug: lp-699251 This seems to happen when your X server is using both Xinerama and + XRender, and only affects the XRenderChangePicture() call with a + clip_mask. So, I added code to detect Xinerama+XRender and disable + XRender if they're found. + +2011-08-10 DJ Delorie * dj AT delorie dot com * + + * src/action.c: Don't set FOUND flag on silk lines. Closes-bug: lp-699291 + +2011-08-08 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Clean up ghid_pan_fixup () + +2011-08-08 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Re-write some routines with + the new ghid_pcb_to_event_coords API. Cleans up ghid_set_crosshair() and Center() in gtkhid-main.c + +2011-08-08 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gui.h: hid/gtk: Add API to convert pcb units into + drawing widget coordinates. + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/misc.c: misc.c: Remove comment missed from commit e82ad9b + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/macro.h: macro.h: Remove now unused SCREEN_SIGN_{X,Y} macros + +2011-07-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gui-netlist-window.c, src/hid/gtk/gui.h: hid/gtk: + Implement an API to draw the user into a particular location This is renderer-specific, but the general idea is to help the user + find a particular location on the board. + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-netlist-window.c, src/select.c, src/select.h: Move + the SelectPin() function into the file of its only caller. The new function is in hid/gtk/gui-netlist-window.c, and is called + toggle_pin_selected (). Whilst we're at it, simplify the function, removing its always- + constant argument and condense the redrawing calls. + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Remove unused parser token F_Scroll + ("Scroll") + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/action.h: action.c: Remove unused action + "MovePointer" + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-misc.c: hid/gtk: Remove dead "MovePointer" + keyboard navigation code. This was not working correctly anyway, as the action was not + properly registered. Obviously no-one missed it, so let it die. Whilst we are here, kill off the hard-coded panning actions in this + sub-main loop. Eventually, we should use common code for any + keyboard navigation. This only affects operation of the ghid_get_user_xy() function, e.g. + the one which temporarily greys out the PCB user interface whilst + waiting for the user to supply a location. + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Simplify ActionMovePointer() The save / restore of the crosshair coordinates is unnecessary since + we are emitting the appropriate change notifications. + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Remove dead code, IgnoreMotionEvents + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/find.c, src/hid/gtk/gui-drc-window.c, + src/misc.c, src/misc.h, src/select.c: misc.c: Remove unused "delta" + argument from CenterDisplay() All the callers are passing absolute locations. + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * po/POTFILES.in, src/Makefile.am, src/gpcb-menu.res, + src/gpcb-menu.res.in, src/pcb-menu.res, src/pcb-menu.res.in: + Generate pcb-menu.res and gpcb-menu.res from ".in" files No functional changes here, just a preliminary cleaning before + adding the topological autorouter to the menus. Doing so requies + conditional inclusion of certain lines, as the toporouter is not + always built. Based on a patch by Stanislav Brabec * sbrabec AT suse dot cz * Affects-bug: lp-812429 + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/pcb-menu.res: pcb-menu.res: Fixup some more whitespace + +2011-07-18 Stanislav Brabec * sbrabec AT suse dot cz * + + * src/action.c: RipUp(): Rip arcs created by toporouter. Toporouter creates not only lines but also arcs. Rip up all auto + routed tracks should rip these arcs as well. Closes-bug: lp-812380 Reviewed-by: Peter Clifton * pcjc2 AT cam dot ac dot uk * + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * po/POTFILES.in: POTFILES.in: Add src/crosshair.c and + src/autoroute.c We were missing translations before. "make distcheck" now passes ;) + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * doc/Makefile.am: doc: Don't make any DVI targets We don't have rules to build all the prerequisites, and we don't + care about DVI. This is one of the issues causing "make distcheck" + to fail. + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * doc/Makefile.am, doc/gs/Makefile.am: doc: Remove execute + permissions on Makefile.am and gs/Makefile.am + +2011-08-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/gpcb-menu.res, src/pcb-menu.res: Clean up whitespace in + [g]pcb-menu.res + +2011-08-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: crosshair.c: Fix layer check for off-grid line + snapping in line-draw mode + +2011-08-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: crosshair.c: Revise heuristic for snapping on + off-grid lines Only snap to an off-grid section of a line when: Drawing lines on the same layer as the one being snapped to When + manipulating the end-point of a _different) line on the same layer + as the one being snapped to. This should hopefully reduce the tendancy of the off-grid-line code + to cause lots of unnecessary snapping. + +2011-08-01 Gabriel Paubert * paubert AT iram dot es * + + * src/hid/lesstif/main.c: Correct parameter order in Distance + function in hid/lesstif/main.c in src/did/lesstif/main.c, the Distance function is called with the + parameters in the wrong order. This small patches fixes the problem. I still think that the format + is wrong, or at least the rounding to integer mm/mil taking only the + grid into account, but I've not yet decided on how to fix it. The + worse is that often the display is wrong because the decimal part is + truncated (displaying say -24 between two grid points on a 5mil + grid). Gabriel + +2011-07-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/png/png.c: hid/png: Increase the maximum allowable DPI of + the exporter Sometimes for rendering fiddly boards, you just need the detail. Move the arbitrary 1000 dpi limit to still arbitrary, 10000 dpi. + +2011-07-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/ps/ps.c: hid/ps: Fix arc drawing since pcb_printf patch The last parameter to the arc macro we use for drawing arcs is + unitless, so should be a double. This was broken by: commit fa9ae1f6b1eabaab961795ce7be53afe46eaa735 Convert ps/eps/lpr HID's to use pcb-printf I've reverted the change, and added an extra (double) cast compared + to what was there before, I'm not sure we wouldn't get an integer + division without it. One day I should learn these type promotion / + casting rules properly! ;) + +2011-07-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: hid/gtk: Add a + shutdown function to the renderer backends This will be necessary to stop any event handlers / timers which + should not fire as the GUI is being shut down. This code isn't actually very "live" at the moment, as the place + I've hooked up its trigger (the destroy event of the main window), + doesn't actually appear to get called. This seems to be because the core "Quit" action just kills the + program dead, rather than attempting to shut down the GUI. + +2011-07-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-netlist-window.c: hid/gtk: Do not run a main loop + from within the netlist window code. It turns out that this is a really bad idea.. if the main loop is + kept busy, the new main-loop never exits and the events can become + reentrant. I discovered this when testing code for an animation which used the + main event loop for its timing. Each time a node was selected in the + netlist window, stack-frame would grow - as the new nested main + loops never became idle. Segfaults ensued quite readily, presumably + due to the code not being designed to be reentrant. It appears from reading the code, that these: while (gtk_events_pending ()) /* Make sure everything gets + built */ gtk_main_iteration (); Are not actually necessary. + +2011-07-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-netlist-window.c: hid/gtk: Skip check before + calling ghid_netlist_window_create If the window already exists, ghid_netlist_window_create() is a + NOOP, so there is no point in checking twice. + +2011-07-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-netlist-window.c, src/hid/gtk/gui.h: hid/gtk: + Remove unused function ghid_netlist_nodes_update () + +2011-07-25 DJ Delorie * dj AT delorie dot com * + + * src/default_font: Tweak default font. Minor changes to various glyphs to improve readability and + legibility, such as making V look less like U, or 8 less like 0. No + changes to font metrics, bounding boxes, or spacing. + +2011-07-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Fix up paning when flipping + the board. I'm not sure when this got broken, but it was probably my fault ;) + +2011-07-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * : commit f9ad6634a55f7f79106945e3307aafe0d39eae61 Author: Andrew + Poelstra * asp11 AT sfu dot ca * Date: Mon Jul 25 00:33:23 2011 + -0700 + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * : hid/gtk: Refactor viewport handling + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Fixup Zoom() and zoom_by() so + they don't ignore passed coordinates. The Zoom() action was passing bogus coordinates (in pixels), and + zoom_by() was ignoring the passed coordinates and just using the + mouse pointer location last recorded in gport->pcb_x and + gport->pcb_y. Fix zoom_by() to use the passed coordinates, fix Zoom() to not + mangle the passed board coordinates into screen space.. zoom_by() + wants board coords. Finally, remove a special case from the Zoom() action where if the + passed coordinates were both zero, we would pass the PCB coordinates + of the board center. I'm hopeful that things will "just work" + without this. + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui.h: hid/gtk: Introduce a zoom_fit() function, remove + duplicated code. Several places in the code invoke a "zoom_fit" type function by + calling zoom_to() or ghid_port_ranges_zoom() with bogus parameters. Implement a specific function which restricts this to one location, + then remove the now redundant ghid_port_ranges_zoom(), which + basically just duplicated the code from zoom_by() with an added + check for a 0.0 zoom factor to trigger the zoom-to-fit feature. + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Add missing static parameter + to zoom_by() function. + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Some cleanups to the zoom_to() + function Still confusing, but at least its not the fault of the code + formatting now. + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Remove old debugging code from + zoom_to and zoom_by() functions This code was adding to clutter in the functions, and appears in + some cases to be bit-rotten. (The coordinates it operated on don't + appear to be have been consistent with the current GUI code). + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gui-output-events.c, src/hid/gtk/gui.h: hid/gtk: + Abstract away event coordinate conversion to PCB base units + +2010-12-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui.h: hid/gtk: Refactor semantics of, and rename + view_x, view_y coordinates Rather than storing pointer coordinates in the imaginary "view" + system, where the coordinates (in PCB base units) represent that of + an unflipped board, store them such that they are directly + meaningful on the board. As they now directly represent the cursor coordinats on the actual + board, they don't require passing through the SIDE_{X,Y} macros + before use with APIs that expect board coordinates. To avoid confusion, view_x and view_y have been renamed to pcb_x and + pcb_y to reflect the change of semantics. In a number of cases, SIDE_{X,Y} macro calls were added to preserve + correct functionality of old code which manipulates the mouse + position in "view" coordinates. These are primarily concerned with + zooming and panning. Also rename the confusingly titled VIEW_{X,Y} macros to + EVENT_TO_PCB_{X,Y} + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui.h: hid/gtk: Rename {x,y}_crosshair to + crosshair_{x,y} (Just because!) + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: gtk+gl: Convert crosshair drawing to use + PCB world coordinates Whilst I'm at it, add a z-coordinate to the crosshair drawing + functions to future proof them for when we add some 3D effects. + +2011-07-08 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/file.c, src/global.h, src/pcb-printf.c: Introduce Coord/Angle + types, convert global.h and pcb-printf to use it For now Grid (in PCB and Settings) and its increments are still + doubles to avoid serious breakage. Will change these to Coords in a + separate commit. Also add %ma spec for Angle, tell file.c to use it, to prevent + printf problems with Angle when changing ctypes. + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * gts/boolean.c, gts/cdt.c, gts/edge.c, gts/partition.c, + gts/split.c: gts: Fixup warnings due to assigned but unused + variables As I'm not 100% familiar with this code, I have commented out some + of the redundant code rather than deleting it completely. + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidgl.c: hid/common/hidgl.c: Cast the function + pointers passed to gluTessCallback() Silences compiler warnings about incompatible pointer types + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/line.c: line.c: Fix a bogus compiler warning regarding a (X + + c) >= X being always true. line.c: In function ‘EnforceLineDRC’: line.c:491:7: warning: + assuming signed overflow does not occur when assuming that (X + c) + >= X is always true [-Wstrict-overflow] It would appear that gcc (4.6.1-5ubuntu1) is identifying the + conditional portions of INDEXOFCURRENT which would always evaluate a + particular way if a given condition is met. It is "probably" safe to + assume that this warning manifests due to gcc considering each + portion of the INDEXOFCURRENT definition in turn. It appears we can avoid this particular warning by temporarily + assigning INDEXOFCURRENT into a variable before we test with it. + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/toporouter.c: toporouter.c: Fixup warnings due to assigned but + unused variables As I'm not 100% familiar with this code, I have commented out some + of the redundant code rather than deleting it completely. + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/undo.c: undo.c: Fixup warnings due to assigned but unused + variables + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/rtree.c: rtree.c: Fixup warnings due to assigned but unused + variables Adds a nasty cludge using #ifndef NDEBUG around a variable + assignment which is only used in a later assert() statement. (NB: + assert() evaluates to nothing if NDEBUG is defined). + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/print.c: print.c: Fixup warnings due to assigned but unused + variables + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/puller.c: puller.c: Fixup warnings due to assigned but unused + variables + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/polygon1.c: polygon1.c: Fixup warnings due to assigned but + unused variables Adds a nasty cludge using #ifndef NDEBUG around a variable + assignment which is only used in a later assert() statement. (NB: + assert() evaluates to nothing if NDEBUG is defined). + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/fontmode.c: fontmode.c: Fixup warnings due to assigned but + unused variables + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/find.c: find.c: Fixup warnings due to assigned but unused + variables + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/djopt.c: djopt.c: Fixup warnings due to assigned but unused + variables + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/copy.c: copy.c: Fixup warnings due to assigned but unused + variables + +2011-07-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: autoroute.c: Fixup warnings due to assigned but + unused variables Adds a nasty cludge using #ifndef NDEBUG around a variable + assignment which is only used in a later assert() statement. (NB: + assert() evaluates to nothing if NDEBUG is defined). + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Fixup warnings due to assigned but unused + variables + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gcode/trace.c: hid/gcode: Fixup warnings due to assigned + but unused variables + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/bom/bom.c: hid/bom: Fixup warnings due to assigned but + unused variables + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-library-window.c, + src/hid/gtk/gui-top-window.c: hid/gtk: Fixup warnings due to + assigned but unused variables + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: crosshair.c: Snap to points along off-grid lines + when drawing tracks This should greatly easy making tidy layouts where some lines have + (perhaps by necessity) ended up off-grid. This patch adds code to snap onto the center of a line. It finds the + nearest grid point to the cursor, then will allow snapping at the + intersections between the line in question and the lines of an + imaginary X and + centered on the nearest grid-point to the cursor. This allows neat drawing of horizontal, vertical and 45 degree lines + which will land correctly on the existing line. + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: crosshair.c: Rename some variables for clarity + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: crosshair.c: Always allow snapping to the element + mark (except in rat-draw mode) + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: crosshair.c: Don't snap to an element's mark in + rat-draw mode. + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: crosshair.c: Drop checks to ensure the crosshair + is inside the PCB It would seem that the MIN, MAX functions applied when setting + Crosshair.X and Crosshair.Y should already constrain the coordinates + such that the removed code was never triggered. It isn't obvious that these removed checks are even correct, or are + being triggered. Drop the checks in the hope that the now simplified + code continues to "just work" without the special casing. + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/parse_y.y: parse_y.y: Remove unused GRIDFIT macro + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: Try snapping to element marks first, as they are + only a weak snap. Because the element mark is never chosen in preference to a closer + grid point, we should try snapping to it first - rather than last. Currently, we might have a crosshair location where (say), a pad is + snapped to in preference to the nearest grid-point, then the element + mark is tested and snapped to because it is closer than the pad. + This can occur even when there is a closer grid point than the + element mark, since the grid snap (nearest_is_grid == true) has + already been discarded by the snap to the pad. + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: Refactor crosshair snap code to reduce + duplication and improve readability + +2011-07-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/search.c: Allow editing of ordinary text objects when element + names are hidden Closes-bug: lp-810678 + +2011-07-19 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-netlist-window.c: Fix crash in netlist window + caused by heirarchical netlists See http://archives.seul.org/geda/user/Jul-2011/msg00133.html + +2011-07-12 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c: Remove special grid-change handling + from Gtk + +2011-07-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/lesstif/dialogs.c, src/hid/lesstif/main.c, + src/hid/lesstif/menu.c: Convert lesstif hid to use pcb-printf Should be no user-visible changes, except this bug: Closes-bug: + lp-805273 + +2011-07-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/pcb-printf.c: Add support for + and .* subspecifiers in + pcb-printf + +2011-07-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/lesstif/main.c: Clean up coords_to_widget() in + lesstif/main.c The coords_to_widget() function is used in exactly two places, for + different purposes. To differentiate between the two uses, the + ``state'' parameter is set to -1. The parameter is confusing enough without overloading it in this + way. Therefore I have split the function into two: mark_delta_to_widget cursor_pos_to_widget Further, I have converted the code inside the functions to use + g_printf_strdup instead of a fixed buffer. The functions should both + be easier to read now than the original. There is one small change to user-visible output, which I think is + justified: if you have a very small metric grid (<= 5um), the + mark_delta output now uses .3f for both cartesian and radial + display. Before it would use .3f for cartesian, .2f for radial. + +2011-07-01 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-dialog-size.c, + src/hid/gtk/gui-misc.c, src/hid/gtk/gui-top-window.c: Convert gtk + gui to use pcb-printf There should be no user-visible changes. Note that as long as base units are cmils, the .9999 bug in the + cursor status is back. This is not a problem with smaller base units + (I am using 17nm and all is okay.) Note also that the report dialogs are entirely based on report.c, so + that is not part of this commit. + +2011-06-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/ps/eps.c, src/hid/ps/ps.c: Convert ps/eps/lpr HID's to use + pcb-printf The postscript HID now uses pcb-printf to output all units as inches + rather than cmils; therefore the default scale is now 1:1 rather + than 1:10000. Therefore there will be a change in raw ps output but + not in printed output. As inches are output with 5 digits after the decimal point, there + will be no loss in precision, though in future this will be easy to + increase. Also, minor code cleanups in ps.c to reduce global state and make + global variables more visible. + +2011-06-28 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/pcb-printf.c: Make pcb_fprintf ignore NULL file handle There is a lot of code in the HID's that looks like if (f != NULL) fprintf (f, "..."); I have moved the NULL check inside pcb-printf to remove this + repetition/potential mistake. + +2011-06-26 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/file.c: Make sure scale/direction are not output as measures + in file.c + +2011-06-25 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/report.c: Fix typo in unplated hole output in report.c + +2011-06-22 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/toporouter.c: Convert toporouter trace code to use pcb-printf There is still a fair amount of trace code outputting measurements + that are floating-point values. I left these alone since they will + work independently of the actual type of BDimension. Everything should still be output in base units. + +2011-06-21 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/polygon.c, src/polygon1.c: Convert polygon and polygon1.c + debug code to use pcb-printf + +2011-06-21 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/puller.c: Convert puller.c trace code to use pcb-printf Minor changes to trace output (addition of parens, mainly). Should + be no user-visible output. No longer assumes BDimension == int. + +2011-06-21 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/djopt.c: Convert djopt.c to use pcb-printf No change in user-visible output. Debug output is slightly changed since pcb-printf likes to put + parens around tuples, so "%d,%d" is now effectively "(%d, %d)". + Debug output is all base units, so the numbers will not change until + the base unit size is changed. + +2011-06-21 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/autoroute.c: Convert autoroute.c debug code to use pcb-printf Should be no change in output. Only change is that we no longer + assume BDimension == int. + +2011-06-21 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/action.c: Change action.c *WARN* lines to use pcb-printf Now instead of outputting unsuffixed cmils, warnings about + locked/unnamed elements will refer to the part's position in either + mm or mil, with an appropriate suffix. Non-warning-related output is unchanged. + +2011-06-21 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/file.c: Convert file.c to use pcb-printf for cmil output file.c now uses pcb-printf, though in a limited way: everything is + still output in unsuffixed cmils, though this is now independent of + pcb's internal unit size. I have also removed the old-style output for symbols. Aside from that, everything should be the same. Any other change in + output, or file format incompatibility of any kind, is a bug. + +2011-06-21 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/pcb-printf.c, src/pcb-printf.h: Add # subspecifier to + pcb-printf to prevent scaling for debug output + +2011-06-21 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/puller.c: Convert puller.c to use Distance() intead of its own + function + +2011-06-21 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/pcb-printf.c, src/pcb-printf.h: Add pcb_printf to pcb_*printf + family of functions + +2011-06-19 Krzysztof Kościuszkiewicz * k dot kosciuszkiewicz AT gmail dot com * + + * doc/Makefile.am: doc: do not distribute dvi files DVI files cannot be generated without LaTeX, and since commit + 3afdb7efdaf6cc8094cc6143269e7df519183197 only pdfLaTeX is supported. + +2011-06-19 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/lesstif/menu.c: Allow 1...9 and Ctrl+1...9 accellerators + for silk/rats in lesstif + +2011-06-19 Levente Kovacs * leventelist AT gmail dot com * + + * src/find.c, src/global.h: gEDA-user: skpi_drc patch On Fri, 17 Jun 2011 17:30:22 -0400 DJ Delorie * dj AT delorie dot + com * wrote: > You want the (already global) AttributeGet() function. > > + l->no_drc = AttributeGet (l, "PCB::skip-drc") != NULL; > > This does + assume that the attribute has *some* value, even if the > value is + the empty string. Thanks for pointing this out. Attached is the new patch. Levente -- Levente Kovacs http://levente.logonex.eu + +2011-06-20 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/main.c: Lesstif: ignore crosshair changes before + window exists. + +2011-06-19 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gui-top-window.c: Allow 1..9 accelerator keys to be + applied to non-copper layers in gtk Closes-bug lp-699327 + +2011-06-19 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/report.c: Change report.c to use pcb-printf Right now there should be no change in the output from report.c; + this is essentially just a code cleanup. The prec/UNIT nastiness is + cleaned up -- precision is handled by the defaults in pcb-printf (.2 + for mil, .4 for mm, same as before) and unit selection is done with + the %m+ specifier. It's easy now to expand to allow auto-scaling or even automatic + selection of metric/imperial based on sig. figs., but I've played + around with this and it looks like mixing units is confusing and + hard-to-read, so we're sticking with just one of mm/mil for now. + +2011-06-19 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/pcb-printf.c, src/pcb-printf.h: Add %m+ specifier to + pcb-printf As long as our base units are cmils, allowing pcb-printf to guess + the most natural units for displaying measures is a bad idea -- it + cannot reliably count significant figures for many values. The + result, for example, in report.c, is inconsistent and confusing + dialogs with a mix of metric and imperial measurements. The %m+ specifier is used to force pcb-printf to only use certain + units; in this case, the user's gui setting of metric/imperial. + +2011-06-19 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/misc.c, src/misc.h: Add Distance() function to avoid overflow + with sqrt(x*x + y*y) + +2011-06-19 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/move.c: Fix typo (Polygon++ ==> PolygonN++) in src/move.c Closes-bug: lp-796059 + +2011-06-19 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: Set file pointer to NULL after closing in + gerber.c Closes-bug: lp-795734 When cleaning up the gerber HID, I had changed the file pointer used + in maybe_close_f from a global to a (local) argument -- which made + the line ``f = NULL'' effectively a no-op. However, the global variable f does need to be set to NULL for the + code to recognize that the file is closed; otherwise it tries to + keep using the (now invalid) file handle, causing crashes whenever + the gerber HID is used more than once. This is now done after every call to maybe_close_f(), rather than + depending on the function itself to have side effects. + +2011-06-17 DJ Delorie * dj AT delorie dot com * + + * src/hid/png/png.c: Check for empty layers in photo mode Now that the default stackup is for six layer boards, the PNG photo + mode output needs to check to see if the user has used the inner + layers, and automatically adapt - so that a two layer board *looks* + like a two-layer board. + +2011-06-17 Gabriel Paubert * paubert AT iram dot es * + + * src/hid/gerber/gerber.c, + tests/golden/hid_gerber3/arcs.plated-drill.cnc: Fix printf specifier + for gerber drill output + +2011-06-16 Andrew Poelstra * asp11 AT sfu dot ca * + + * configure.ac, tests/golden/Makefile.am, + tests/golden/hid_gerber3/Makefile.am, + tests/golden/hid_gerber3/arcs.bottom.gbr, + tests/golden/hid_gerber3/arcs.fab.gbr, + tests/golden/hid_gerber3/arcs.group1.gbr, + tests/golden/hid_gerber3/arcs.group4.gbr, + tests/golden/hid_gerber3/arcs.plated-drill.cnc, + tests/golden/hid_gerber3/arcs.top.gbr, tests/inputs/Makefile.am, + tests/inputs/gerber_arcs.pcb, tests/tests.list: Add hid_gerber3 test + to check arc rendering + +2011-06-16 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: Re-insert casts to unit conversion macros + in gerber.c + +2011-06-12 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: Convert gerber hid to use pcb-printf + +2011-06-12 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gcode/gcode.c: Convert gcode hid to use pcb-printf + +2011-06-12 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/bom/bom.c: Convert BOM hid to use pcb-printf + +2011-06-12 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/pcb-printf.c, src/pcb-printf.h: Correct handling of %.*f in + pcb-printf, remove from known issues + +2011-06-12 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/batch/batch.c: Convert batch HID to use pcb-printf + +2011-06-11 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/Makefile.am, src/pcb-printf.c, src/pcb-printf.h: Add + pcb-printf.c to allow custom specifiers for unit output From the header: /* This file defines a wrapper around sprintf, that * defines new specifiers that take pcb BDimension * objects as input. * * The new specifiers are: * %mm output a measure in mm * %mM output a measure in scaled (mm/um) metric * %ml output a measure in mil * %mL output a measure in scaled (mil/in) imperial * %ms output a measure in most natural mm/mil units * %mS output a measure in most natural scaled units * %md output a pair of measures in most natural mm/mil units * %mD output a pair of measures in most natural scaled units * %m3 output 3 measures in most natural scaled units * ... * %m9 output 9 measures in most natural scaled units * %m* output a measure with unit given as an additional * const char* parameter * %mr output a measure in a unit readable by parse_l.l * (this will always append a unit suffix) * * These accept the usual printf modifiers for %f, * as well as the additional modifier $ which is * used to output a unit suffix after the measure. * * KNOWN ISSUES: * No support for %zu size_t printf spec * No support for .* subspecifier for pcb specs */ + +2011-06-09 DJ Delorie * dj AT delorie dot com * + + * globalconst.h, src/buffer.c, src/global.h, src/parse_y.y: Fix + shift/reduce conflicts Closes-bug: lp-794743 I moved the interpretation of what "measurement" means even further + up the heirarchy, by storing the original integer part as well as + the units in a structure, and applying the new/old/unitless meanings + where they're used. This way, there's no conflicts between a number + which is a measurement, and a number which is a flag or mask, for + the old formats that differ only in the number of parameters. I also cleaned up the parser rules for "zero or more" type lists, to + remove most of the remaining conflicts. There's still one at the + toplevel because we try to parse different types of files with the + same parser. Lastly, the symbol rules were combined into a "symbol head" rule + with a common "symbol body" rule. As a side effect, we can now reliably use units on old-style formats + again, since the *100 scale factor is only applied if the units are + not specified. + +2011-06-06 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/autoroute.c, src/macro.h: Remove memory allocation from + src/macro.h When we started using GLists for various objects, we also changed + the looping macros to allocate copies of the list in order to avoid + problems with list integrity in case items were removed during the + iteration. However, this caused memory leaks whenever there was an early return + from the middle of the list. Bug lp-792139 shows pcb using over 2Gb + of memory and crashing when optimizing rats on a large board. This patch saves the next pointer before the loop body, rather than + allocating a whole new list, to handle element deletions. Closes-bug: lp-792139 + +2011-06-01 Krzysztof Kościuszkiewicz * k dot kosciuszkiewicz AT gmail dot com * + + * configure.ac, doc/Makefile.am, doc/gs/Makefile.inc: doc: use + pdflatex instead of latex + +2011-06-01 Krzysztof Kościuszkiewicz * k dot kosciuszkiewicz AT gmail dot com * + + * doc/Makefile.am, doc/gs/Makefile.inc: doc: skip generation of GIF + images + +2011-06-04 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/file.h, src/parse_l.l, src/parse_y.y: Add support for reading + unit suffixes in parser Bumped PCB_FILE_VERSION up to 20110703. Removed old unit-reading code from parse_l.l since it was missing + several units that we plan to support, and the scaling was backward + for non-base units. Also, we now read all numbers as doubles, except those that need + integers (array indices and flags, mainly). All measurements are + round()ed to ints, after scaling, since that's what BDimension is + and we don't want anomalies. The old NUMBER and FLOAT terminals in parse_y have been replaced by: 1. INTEGER - an integer, unscaled 2. number - floating or integer, unscaled 3. measure - a (possibly suffixed) measurement, with non-suffixed measurements read in cmils 4. oldmeasue - non-suffixed measurement, read in mils One exception is the PolyArea[] field. This is still read in cmil^2 + until we figure out what to do with it. This way the parser works independently of PCB's internal base + units, and supports umil, cmil, mil, in, nm, um, mm, m and km unit + suffixes. The parsing code should also be clearer now since not + everything is NUMBER, with scale factors handled after-the-fact with + /100's or in the lexer. Additionally, we now allow floating-point values for all + measurements (even old-style mil fields), and pcb will allow spaces + between measurements and their suffixes. Actually using these + ``features'' will probably break tools that read .pcb files, though. + +2011-05-27 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/pcb.texi: Replace @extend with @noindent in docu-source If the @extend keyword is used to remove an intentation, the text + will have a linebreak, where the source has one. If @noindent is + used instead, the lines will be breaked as in normal paragraphs. + +2011-05-25 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Fix docu for 'ImportGUI()' + +2011-05-27 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/pcb.texi: Docu: Remove incomplete irritating sentence + +2011-05-31 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/pcb.texi: Remove repeated word in documentation + +2011-05-17 Alberto Maccioni * alberto dot maccioni AT gmail dot com * + + * doc/Makefile.am, doc/gcode.pcb, doc/gcode_control_img.eps, + doc/gcode_tool_path.eps, doc/pcb.texi: Add documentation for G-Code + export GUI This patch contains the documentation changes from lp:699476. It + adds a new manual section on exporters and documents the gcode + exporter. Sample pcb file is added with control image and the + resulting toolpath. Reviewed-by: Felix Ruoff * Felix AT posaunenmission dot de * + Reviewed-by: Krzysztof Kościuszkiewicz * k dot kosciuszkiewicz AT + gmail dot com * Closes-bug: lp-699476 + +2011-05-24 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: gEDA-dev: + gerber-cleanup-0006-Change-a-couple-more-0-s-to-NULL-s.patch + +2011-05-24 Andrew Poelstra * asp11 AT sfu dot ca * + + * globalconst.h, src/hid/gerber/gerber.c: gEDA-dev: + + gerber-cleanup-0005-Remove-old-now-unused-aperture-structures-functions.patch + +2011-05-24 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: gEDA-dev: + + gerber-cleanup-0004-Use-new-aperture-functions-output-100-equal-to-origi.patch + +2011-05-24 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: gEDA-dev: + + gerber-cleanup-0003-Add-new-aperture-functions-but-don-t-use-them.patch + +2011-05-24 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: gEDA-dev: + + gerber-cleanup-0002-Remove-global-variable-dependence-from-maybe_close-a.patch + +2011-05-24 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: gEDA-dev: + gerber-cleanup-0001-Remove-unused-Aperture-structure.patch + +2011-05-25 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gtk/gui-output-events.c: hid/gtk: Fix tooltips Closes-bug: lp-786733 + +2011-05-25 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/pcb.texi, src/global.h: gEDA-user: PCB: option dumpmenu + missing A patch to remove this from documentation (and one variable from the + source) is appended. Kind regards, Felix Am 25.05.2011 19:11, schrieb DJ Delorie: > I think that option is a + leftover from my initial HID conversion. > > It would have been + lesstif-specific anyway, the gtk hid has its own > menu file + (gpcb-menu.res, same locations) > > > + _______________________________________________ > geda-user mailing + list > geda-user AT moria dot seul dot org > + http://www.seul.org/cgi-bin/mailman/listinfo/geda-user > >From 94458c63ae97135964c41f4966b9cdf65ee4ec27 Mon Sep 17 00:00:00 + 2001 From: Felix Ruoff * Felix AT posaunenmission dot de * Date: + Wed, 25 May 2011 14:36:34 +0200 Subject: [PATCH 50/50] Remove + commandline-option 'dumpmenu' from docu and source + +2011-05-23 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gerber/gerber.c: gEDA-dev: Gerber hid code cleanup New patch is as follows (sizeof and casts fixed): + +2010-03-18 Newell Jensen * pillar2012 AT gmail dot com * + + * src/hid/png/png.c: hid/png: draw zero-length arcs properly on + export Closes-bug: lp-699314 Reviewed-by: Patrick Bernaud * patrickb AT + chez dot com * Reviewed-by: Krzysztof Kościuszkiewicz * k dot + kosciuszkiewicz AT gmail dot com * + +2008-01-04 Wojciech Kazubski * wk0 AT o2 dot pl * + + * lib/geda.inc, lib/misc.inc: add more crystal footprints to m4 + library Currently m4 symbols contain one footprint for crystal holder + (HC49), wich is not accurate, pin spacing is a bit too big and the + outline is too small. This patch adds several m4 crystal holder footprints of different + size, 2 or 3 pin, both standing and laying. Closes-bug: lp-699440 Reviewed-by: Bert Timmerman * bert dot + timmerman AT xs4all dot nl * Reviewed-by: Krzysztof + Kościuszkiewicz * k dot kosciuszkiewicz AT gmail dot com * + +2011-01-02 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-dialog.c: hid/gtk: use + GTK dialog for confirming file-overwrite Since GTK 2.8 GTK provides an dialog for confirming + file-overwriting. This dialog will be introduced by this patch. + Needless code which was used for this will be removed. Closes-bug: lp-699508 Reviewed-by: Krzysztof Kościuszkiewicz * k + dot kosciuszkiewicz AT gmail dot com * + +2011-01-09 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/refcard.tex: Fix refcard (missing footnote and add rotate + buffer) The shortcut 'shift-F7' for rotating paste buffer by 90 degree is + added as suggested in bug LP-699391 (formerly sf-1112590). Fix footnote used in the tabular environment. Closes-bug: lp-699391 Reviewed-by: Krzysztof Kościuszkiewicz * k + dot kosciuszkiewicz AT gmail dot com * + +2011-05-17 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/pcb.texi: Fix doku for invisibleObjectsColor (color) Closes-bug: lp-699306 + +2011-04-24 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/gpcb-menu.res: Fix warning for gtk describing menuitems With GTK+ there are no 'describing menuitems' avaiable (the + out-grayed items in lesstif-GUI). For this reason, the items in + gpcb-menu.res are ignored and a warning is displayed at the + message-log. This patch fixes this by removing these describing menuitems for the + gtk-GUI and renamed the described items to a more explaining label. + It also added mnemonics for these menu-items. Closes-bug: lp-769815 + +2010-12-28 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gtk/gui-output-events.c: hid/gtk: Cleanup conditional code + because GTK 2.12 is required now Closes-bug: lp-699510 + +2011-05-20 Colin D Bennett * colin AT gibibit dot com * + + * src/draw.c: Fix typo exporting plated vs unplated drills. Closes-bug: lp-785463 + +2011-05-20 DJ Delorie * dj AT delorie dot com * + + * src/hid/png/png.c: Don't register the PNG hid if there are no file + formats to use. In some cases, the GD library may not have any usable image formats + for us to use, resulting in an empty filetypes[] table. Rather than + trying to accomodate an empty table during export, it's easier (and + perhaps better) to simply not register the PNG hid in that case. + Thus, the exporter is simply not available when the table is empty. + +2011-03-23 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/file.c: Ignore *.pcb files on generating library Closes-bug: lp-699261 + +2011-05-20 DJ Delorie * dj AT delorie dot com * + + * src/hid/common/flags.c, src/hid/gcode/gcode.c, + src/hid/gerber/gerber.c, src/hid/hidint.h, src/hid/nelma/nelma.c, + src/hid/ps/ps.c: Add option to specify gerber output file style. --name-style Naming style for individual gerber files Default is "fixed" which uses a fixed name (foo.top.gbr) for each + layer. "single" uses the layer's name if there's exactly one layer + in that group, else the fixed name. "first" always uses the layer + name, choosing the first layer in each group for the name. "eagle" + mode adds a three-character suffix instead of a separate type and + extension. Affects-bug: lp-700877 + +2011-05-19 DJ Delorie * dj AT delorie dot com * + + * src/move.c: Avoid top/bottom issues with layer deletion. PCB does not currently support boards without a top or bottom, so + prevent the user from deleting them (they'd need to reassign the + top/bottom groups first). + +2011-05-19 DJ Delorie * dj AT delorie dot com * + + * src/draw.c: Fix Mark size math wrt unplated holes. When computing the Mark size, check for the first pin being a hole + and use the drill size rather than the copper size. + +2011-05-19 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/buffer.c: buffer.c: Update polygon r-tree when adding a + polygon to the buffer. This resulted in a crash when rotating a buffer containing a + polygon, as the polygon r-tree associated with the buffer was NULL + despite the polygon count being non-zero. Reported-by: Gabriel Paubert * paubert AT iram dot es * + +2011-05-18 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/move.c: move.c: Adjust the object counters when moving objects + between layers This fixes a crash introduced by commit + 2ce35292b9e96da38cb56878005aba20891689eb, "Convert board objects to + GLists of g_slice allocated memory" It doesn't fix entirity of the defect reported in that bug, but it + restores the prior behaviour where PCB would hang, not segfault. Reported-by: Colin Bennett * colin AT gibibit dot com * Affects-bug: lp-783640 + +2011-05-17 Gabriel Paubert * paubert AT iram dot es * + + * src/hid/gtk/gui-output-events.c, src/hid/lesstif/menu.c: Lesstif + + GTK HIDs: Ignore ISO Level3 shift modifier key This key press is found on some international keyboards (e.g. + Spanish). If we don't ignore it, PCB complains about the key not + being tied to an action when it is pressed. From the committer, Peter Clifton * pcjc2 AT cam dot ac dot uk * + ... Thanks to Gabriel for reporting this and providing the patch + for Lesstif. I have updated the patch to make the equivalent change + to the GTK HID as well. Signed-off-By: Peter Clifton * pcjc2 AT cam dot ac dot uk * + +2011-05-17 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/buffer.c: buffer.c: Fix crash in SmashBufferElement The element is allocated with g_slice_new, so must be free'd with + g_slice_free. Broken since commit 2ce35292b9e96da38cb56878005aba20891689eb: Convert board objects to GLists of g_slice allocated memory + +2011-05-16 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/rtree.c, src/rtree.h: rtree.c: Remove unused r_substitute() + function This function was used to update r-trees when they contained objects + changed memory location. Since we no longer shuffle objects around + when we delete them, this function is no longer required. + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: GTK/GL: Draw pretty translucent polygons + in thindraw-poly mode Eventually we need some way to configure this.. it might be nice in + non-thindraw mode too. If people want thin-draw to gain extra speed, + rather than have it actually slower (due to fill + outline), then a + way to turn it off would also be useful. + +2011-05-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: GTK/GL: Add facility to set an alpha + multiplier for the current rendering + +2011-05-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: GTK/GL: Refactor alpha handling Replace "alpha_mult" in set_gl_color_for_gc () with just explicitly + calling this the "a" (alpha) value of the colour in question. + +2011-05-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: GTK/GL: Refactor GL colour setup handling + +2011-05-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c: hid/gtk: Remove + unused gc->erase parameter from GDK and GL renderers + +2011-05-14 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui.h: hid/gtk: Setup custom + polygon renderer for the GL HID only + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: gtk/gl: Don't set "magenta" for a NULL + color passed to ghid_set_color The code has a strdup (name), followed by a test for name == NULL. + If name _were_ ever NULL, the strdup would crash, so we can remove + this test. + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidgl.c: hid/common/hidgl.c: Use tags on circular + contours to render them faster This lets us avoid the polygon tesselator for circular contours, and + lets us render a different number of vertices in our appoximation + depending upon zoom level. + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidgl.c: hid/common/hidgl.c: Fix vertex array state + preservation Fixes a bug with crosshair attached objects not being visible when + the grid was rendered. Reported-by: Colin D Bennett * colin AT gibibit dot com * + Closes-bug: lp-780958 + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/Makefile.am, src/hid/batch/batch.c, src/hid/bom/bom.c, + src/hid/common/hidinit.c, src/hid/common/hidnogui.c, + src/hid/common/hidnogui.h, src/hid/gcode/gcode.c, + src/hid/gerber/gerber.c, src/hid/gtk/gtkhid-main.c, + src/hid/hidint.h, src/hid/lesstif/main.c, src/hid/lpr/lpr.c, + src/hid/nelma/nelma.c, src/hid/png/png.c, src/hid/ps/eps.c, + src/hid/ps/ps.c: Refactor application of the default hidnogui HID + handlers. Replace usage of apply_default_hid() just prior to registering a HID + with an early call to the new common_nogui_init() function which + pre- applies the defaults, rather than post-replacing NULL handlers. As this was the last user of the apply_default_hid() function, + remove it. Good riddance to yet another place which had to be + updated every time a new HID member was added. The default nogui HID is now constructed explicitly by a call to + nogui_hid_get_hid (), which is called from hid_init(). This is + different to the other HIDs, as the nogui "hid" is never explicitly + registered. + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/batch/batch.c: hid/batch: #include + "hid/common/draw_helpers.h" which was missing Fixes a compiler warning about an implicitly declared function. + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/lpr/lpr.c, src/hid/ps/ps.c, src/hid/ps/ps.h: hid/ps: + Provide helper function to fill in HID members useful to other HIDs This avoids setting up the drawing routines of the lpr HID with + apply_default_hid, which is a little opaque. + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidinit.c: hid/common: Remove unused function + hid_register_gui() GUIs are registered with the same API as exporter HIDs. + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/Makefile.am: src/Makefile.am: Use AM_CFLAGS instead of + overriding CFLAGS directly + +2011-05-13 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/lesstif/main.c: Apply the + default hidnogui HID to the GUIs as well. This saves them having to re-implement NOOP implementations for + functions the "nogui" HID provides a non "CRASH;" implementation + for. + +2011-05-09 Ineiev * ineiev AT users dot berlios dot de * + + * src/hid/batch/batch.c: fix batch gui + +2011-05-10 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/search.c: search.c: Don't allow selecting pads or pins of + locked elements The locked flag test was mistakenly being applied ot the pad or pin + its-self, not the parent element. + +2011-05-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: GTK/GL: Split out sub-compositing setup + into a separate function. + +2011-05-08 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: GTK/GL: Make the silk layer translucent + +2011-05-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: GTK/GL: Sub-composite objects on each + layer using the stencil buffer This avoids the highlight where translucent objects on a given layer + are drawn over each other. It enables us to have a translucent silk + screen layer and still be able to read the text. + +2011-05-08 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c, src/hid.h, src/hid/common/hidnogui.c: Add end_layer() + function to HID API to mark the end of a layer's drawing This is going to be useful for the GTK/GL renderer to manage sub- + compositing translucent objects within each layer. + +2011-05-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gl.c: hid/gtk: Enable transparent lines in GL + renderer + +2011-05-08 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidgl.c, src/hid/common/hidgl.h, + src/hid/gtk/gtkhid-gl.c: Manage stencil bitplanes so we don't have + to clear them every time. Clearing the stencil buffer is a slow operation (especially on cards + limited by fill rate (cough.. Intel.. cough), so the more clears we + can avoid, the better. + +2011-05-08 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidgl.c: hid/common/hidgl.c: Tidy up polygon + contour tessleation Move the gluTessBeginPolygon and gluTessEndPolygon calls inside + tesselate_contour, rather than duplicating it in each caller. Also, fix up some comments which were out of date or inaccurate. + +2011-05-08 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid.h, src/hid/common/draw_helpers.c, + src/hid/common/hidnogui.c, src/hid/gerber/gerber.c, + src/hid/png/png.c: HID: Remove "dicer" flag from HID structure. We don't pay any attention to this flag - always dicing the polygons + in our common_fill_pcb_polygon routine. HIDs which don't want diced + polygons implement their own hook for fill_pcb_polygon. + +2011-05-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidgl.c, src/hid/common/hidgl.h, + src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui.h: Add raw polygons + support for the GTK+GL HID, bypassing the no-holes dicer Uses the OpenGL stencil buffer to make drawing polygons with holes + faster. 1. Turn Stenciling on, updates to colour buffer off 2. Clear stencil buffer to 0 3. Paint polygon holes, setting those areas of the stencil buffer to + 1 4. Switch on stencil test (== 0), turn on updates to colour buffer 5. Paint outer polygon through areas of the stencil buffer still 0 6. Clear stencil buffer, switch off stencilling. Caveat: This function might throw up if it is used whilst drawing the mask, + since that uses stenciling as well. We don't use polygons on the + mask, so its not a a problem. (Mask cutouts for octagonal pins do + work correctly). + +2011-05-05 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/main.c: Don't prematurely dismiss the progress + dialog. + +2011-05-05 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/main.c: Improve lesstif progress dialog. Closing the progress dialog cancels the operation. Add a sliding + scale that shows progress. Make the dialog modal so you can't edit + the pcb while autorouting. Fix event loop to handle all pending + events and redraw. Fix elapsed time logic. + +2011-05-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Don't auto-close progress + dialog until commanded to We pass the cancel return value to our caller, but it is up to them + to dismiss the progress dialog. Utilise the response_id to determine when the dialog has been closed + or cancelled, rather than a separate stop_loop variable (which was a + legacy from the blocking gtk_dialog_run() this code was based upon. Tidy up due to resulting simplifications. + +2011-05-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/lesstif/main.c: hid/lesstif: Fix testing timeout value in + lesstif_progress This looks like a typo, but was me testing different values of time + interval between processing events. + +2011-05-04 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/lesstif/main.c: hid/lesstif: Simple progress() + implementation to present a cancel button Does not yet draw an actual progress bar, as I'm not familiar enough + with coding for Lesstif. + +2011-05-05 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: autoroute.c: When live-drawing, only emit one via + per location I'd accidentally put the live-draw via in a place where it would + emit one via for every layer group - causing warnings in PCB's log + about dropped vias. + +2011-05-04 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-library-window.c: hid/gtk: Fix crash in library + window I missed a (GList *)->data dereference when converting to GList + object storage. Unfortunately, the parameter in question was void * + typed, so the compiler didn't notice my mistake. + +2011-05-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: autoroute.c: Provide a progress update for the + autorouter Provide a completion metric related to what pass the auto-router is + processing, how many objects on its heap within a given pass it has + processed, and how many sub-nets it has routed from the total. The progress isn't entirely linear, but the subdivision of process + steps means it does at least march along without too many pauses. It is now possible to cancel the autorouting with a non-zero + response code from the gui's progress dialog. Tested with the GTK HID, Lesstif doesn't yet have an implementation + for HID->progress() + +2011-05-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Provide a simple progress + dialog implementation + +2011-05-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-gl.c, + src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: Fix mesa crash on + startup (for some mesa versions) I'm not sure why it crashed, but it seems that providing a realize + handler which fiddles with the GL context solves it. The underlying + problem appears to have been fixed in later mesa versions. Leaving this commit for the benefit users of broken mesa versions. + +2011-05-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * configure.ac: Make --enable-gl default when building the GTK HID Lets get this feature some testing for now - we may decide to revert + the default before the next release, depending on how things + progress. + +2011-05-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * configure.ac, src/Makefile.am, src/hid/common/hidgl.c, + src/hid/common/hidgl.h, src/hid/gtk/gtkhid-gl.c, src/hid/gtk/gui.h: + hid/gtk: Drop in GL renderer - WOOT! Much of the generic GL drawing stuff lives in a new common helper, + hid/common/hidgl.[ch]. Unavoidably, there is a lot of GUI specific + setup and teardown code. There are probably still bits of code in hid/gtk/gtkhid-gl.c which + could be moved to a shared place if / when other HIDs wish to use GL + rendering. Currently only rat lines are drawn transparent, as we need to sub- + composite each layer to avoid a confusing field of hightlights being + drawn where line ends overlap. configure --enable-gl now checks for the required GL, glu and + GtkGLEext. More good stuff to come soon! Credits: Algorithm to calculate number of segments to use in circular curve approximation suggested by DJ Delorie. Thanks to Krzysztof Kościuszkiewicz for testing and debugging some issues with the GL_SCISSOR_TEST being used. An small team of dedicated testers who have provided feedback, bug reports and encoragement throught the long development of this branch. + +2011-05-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/common/flags.c, src/hid/gtk/gtkhid-main.c, + src/hid/lesstif/main.c, src/main.c, src/misc.c, src/misc.h, + src/parse_y.y: Universal use of GetValue This is a patch to make all numeric code use GetValue, to unify + parsing code and make sure everything uses the same units. Contained + is almost a complete rewrite of GetValue to simplify code that uses + funny units. Reviewed-by: Peter Clifton * pcjc2 AT cam dot ac dot uk * When committing the patch from Launchpad, I rebased it to apply with + strcasecmp and strncasecmp changed to strcmp and strncmp, as changed + by commit 31b7309764f2e4bd40141038c30f1f38309efb4a Affects-bug: lp-772027 + +2011-05-03 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/gtk/gtkhid-main.c, src/hid/lesstif/main.c, + src/hid/png/png.c, src/misc.c, src/parse_l.l, src/report.c: Add + case-sensitivity to all unit-reading code Reviewed-by: Peter Clifton * pcjc2 AT cam dot ac dot uk * This breaks existing behaviour for any users using capitalised units + in scripts, but as in general, units ARE case sensitive, we should + not support anything other than their canonical names. Affects-bug: lp-772027 + +2011-05-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: autoroute.c: Simplify some long if statements In a couple of cases, almost all the processing logic was burried + inside an if statement checking for validity of this processing + pass. Re-organise to test for an invalid condition, then "continue;" + the loop if that is hit. This reduces the nesting of some rather complex functions. + +2011-05-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: change.c: Fix drawing artaefacts when rotating the + buffer In commit 0213e4791f9aa4008c8d06a48c377b338f6e1a43 converting + {Hide,Restore}Crosshair calls to become notify_crosshair_changed, I + mixed up two of the true / false parameters to to + nofify_crosshair_changed. This caused the GUI to get out of sync undrawing and redrawing the + crosshair attached objects around the change. Manually checking the diff from the offending commit, I don't see + any other calls which were transposed incorrectly. Reported-by: DJ Delorie * dj AT delorie dot com * + +2011-05-02 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/lesstif/main.c: hid/lesstif: Fix dropped crosshair + artaefacts when dragging objects. It seems that the idle_proc redraw code assumed the crosshair was + switched off upon entry, proceeding to redraw everything (and + obliterate the crosshair in the process). The final show_crosshair + (1) call only has any effect if the crosshair was notionally off + before hand. As a quick work-around (you could probably do it with less flicker + with a little more logic), ensure the crosshair is turned off just + prior to redrawing the screen - so it will switch back on correctly + afterwards. + +2011-05-01 DJ Delorie * dj AT delorie dot com * + + * src/macro.h: Fix typo in new ELEMENTARC_LOOP macro. line -> arc + +2011-05-01 DJ Delorie * dj AT delorie dot com * + + * src/insert.c: Fix polygon clears on insert. Add the calls to update polygon clearances when a point is inserted + into a line. + +2011-05-01 DJ Delorie * dj AT delorie dot com * + + * src/file.c, src/file.h: Make file version smarter. Restructure the FileVersion[] output to only output the actual + needed version, in cases where a rarely used feature requires a new + pcb. This avoids unnecessary backwards incompatibility. + +2011-05-01 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c: hid/gtk: Fix conversion from world to + screen in ghid_invalidate_lr I accidentally muddled the Vx and Vy conversions routines for the + right and top coordinates. In general, this resulted in the + incorrect region being invalidated - manifesting as artaefacts on + the the screen, such as when dragging objects around. Also drop the (double) cast.. having checked, Vx and Vy take integer + arguments. I'm not sure why the rest of this file casts to double. + +2011-05-01 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c: hid/gtk: Rest clip region for bg_gc, as + it is used for expose events. We set the clip region in the redraw_region() function to clip + drawing to the area which we intend to repaint, but we did not clear + the clip again. This caused expose events to be clipped to the last redraw area + rather than the required damaged area. + +2011-05-01 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c: hid/gtk: Remove unused variable in + use_mask() function + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/lesstif/main.c: hid/lesstif: Remove unused variable in + use_mask routine + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/mymem.c: mymem.c: Provide an optional implementation of + g_list_free_full () This API was only added in GLib 2.28, and it is just a small + convenience function. If an insufficient GLib version is found, + provide our own implementation. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid.h, src/hid/gtk/gtkhid-gdk.c, src/hid/lesstif/main.c: + Remove live drawing parameters for HID->use_mask() These are no longer used by the autorouter, so lets clean the + use_mask() interface to JUST deal with _masking_ from now on ;) + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: autoroute.c: Utilise new HID interface for debug + drawing This gives the HID an opportunity to refuse the autorouter's + drawing. Both the GTK/GDK and Lesstif GUIs accept this drawing, so + either should be suitable for use whilst debugging workings of the + auto-router. The PCB+GL renderer (not yet landed) needs quite a lot of setup + calls to be made before it can allow the core do draw, hence the + need for this notification / permissioning. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: Fix livedraw to work with normal rendering APIs NB: This relies on the immutability of board object pointers, so + must not be applied to older PCB code-bases which would often + re-locate storage of board objects to keep them in a contiguous + array. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/autoroute.c, src/buffer.c, src/create.c, + src/djopt.c, src/draw.c, src/file.c, src/find.c, src/fontmode.c, + src/global.h, src/macro.h, src/move.c, src/mymem.c, src/mymem.h, + src/puller.c, src/rats.c, src/remove.c, src/toporouter.c: Convert + board objects to GLists of g_slice allocated memory This enables pointers for these objects to be immutable during their + lifetime, which is a _huge_ benefit for some operations. Having otherwise was becoming VERY tiresome, and was a perenial + source of bugs tripping up novice and experts of the codebase alike. Due to the risks associated with modifying the structure being + iterated over, this patch makes the relevant *_LOOP macros iterate + over a shallow copy of the underlying GList. This is slight overkill + for many cases, but until we have identified which do not modify the + data-structures it is wise to keep as we are. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/puller.c: puller.c: Re-write parts to use hash tables to store + stashed extra info This vastly simplifies some of the pointer arithmetic which was + previously used to account for underlying location changes when + objects moved. Having tested this, it produces different results than before + application. This may be due to it zapping some underlying bug + which has been removed in the patch, or perhaps more likely, that + its slightly different iteration order over the lines and arcs (due + to g_hash_table_foreach) will result in different pathologies being + hit. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/djopt.c: djopt.c: Tidy up padcleaner() using loop macros + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/djopt.c: djopt.c: Tidy up element_name_for() by using loop + macros + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/move.c: src/move.c: Gratuitous cosmetic changes Split from a future patch which ended up making these changes to + help with consistency. Pre-patching here to avoid a huge delta when + that patch lands. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/buffer.c: src/buffer.c: More cosmetic changes + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/buffer.c: src/buffer.c: Gratuitous cosmetic changes Split from a future patch which ended up making these changes to + help with consistency. Pre-patching here to avoid a huge delta when + that patch lands. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/remove.c: remove.c: Gratuitous cosmetic changes s/return (NULL)/return NULL/ Split from another patch where I just couldn't resist some tidying. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/move.c, src/move.h: Make Move*ToLayerLowLevel() local to + move.c No point in exporting these functions. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/rats.c: rats.c: Tidy up FindPad() Changes are aimed to simplify the delta of a future patch relating + to object storage. Moves indexed addressing of object structures to + fewer places. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/toporouter.c: src/toporouter.c: Tidy up escape() routine Changes are aimed to simplify the delta of a future patch relating + to object storage. Moves indexed addressing of object structures to + fewer places. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/parse_y.y: parse.y: Convert an open-coded loop to use + ALLPOLYGON_LOOP + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-pinout-preview.c: hid/gtk: Remove unused code from + pinout_set_data + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Tidy up DrawEMark Changes are aimed to simplify the delta of a future patch relating + to object storage. Moves indexed addressing of object structures to + fewer places. + +2011-04-30 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c, src/crosshair.c, src/edif.y, src/global.h, + src/mtspace.c, src/polygon1.c: Include glib.h from global.h To avoid compiler warnings, remove the now duplicated (or + unecessary) #define ABS definitions from various files. There has been a build-time dependance on GLib since the toporouter + was added. Lets start to make use of it where it is useful. + +2011-04-29 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/lesstif/main.c: hid/lesstif: Hook up debug drawing APIs + +2011-04-29 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui.h: hid/gtk: Hook up debug drawing APIs + +2011-04-29 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid.h, src/hid/common/hidnogui.c: Add HID apis to handle live + debug drawing from the core It is envisaved that this API should ONLY be used for debugging, not + presenting a user-interface. In general, the GUIs may have their own + special requirements for drawing the board, and this API is not + meant to allow the core to augment or present user-visible drawing. + This is reflected in the API naming. Request permission for debug drawing HID *ddraw = gui->request_debug_draw (void); Returns a HID pointer which should be used rather than the global + gui-> for making drawing calls. If the return value is NULL, then + permission has been denied, and the debug drawing must not continue. Flush pending drawing to the screen void ddraw->flush_debug_draw (void); May be implemented as a NOOP if the GUI has chosen to send the debug + drawing directly to the screen. When finished, the user must inform the GUI to clean up resources: ddraw->finish_debug_draw (void); Any remaining rendering will be flushed to the screen. + +2011-04-29 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/lesstif/main.c: hid/lesstif: Ensure crosshair and mark + updates go to the screen The "pixmap" global might be pointing at one of the backing pixmaps + when we are called. Does not fix any known bug, just in preparation for another patch + relating to debug drawing which may leave pixmap pointing to the + backing store. + +2011-04-29 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c: hid/gtk: Invalidate the damaged region, + not the whole view + +2011-04-29 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/print.c: Subject: PCB / Physical unit macros patch 2: print.c This patch works correctly (i.e., no change in output) for my test + file; about 6800 lines of postscript. The only differences were in + the timestamps, which naturally were slightly different. I also confirmed visually that the before and after printouts look + the same :) Rebased to git HEAD by Peter Clifton * pcjc2 AT cam dot ac dot uk * + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: autoroute.c: Remove a couple of completely unused + debug routines + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/global.h: global.h: Remove unused OutputType members Width and + Height + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: Fixup usage of the never initialised, obsolete, + Output.{Width,Height} For the stroke handling case (relating to zooming) it isn't clear + what is correct, but for now, substitute PCB->MaxWidth and + PCB->MaxHeight. This may still leave stroke based zooming broken, but it was + CERTAINLY broken before. + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-pinout-preview.c: hid/gtk: Remove dead code (due + to bitrot) from pinout_zoom_fit() function The code tried to compare against the uninitialised, unused + Output.Width and Output.Height. Assuming these were initialised to + zero by the compiler, the conditional would always cause the + function to return FALSE. Remove the conditional, and drop the boolean return value from this + function, short-cutting the caller to the utilised code-path. This removes the (long broken) feature where by the natural size (in + pixels) of the pinout preview would be reduced if it was greater + than 3/4 of the viewport size (in pixels) of the active PCB. + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/global.h: Remove unused old{Obj,Line,Box}State members from + the OutputType structure + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c, src/main.c: main.c: Remove setup of global graphics + contexts which are never used draw.c stashes these ones creates its own. Drop the unused ones, and + drop the stashing in draw.c + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: autoroute.c: Use the autoroute graphics context, + not Output.fgGC I'm aiming to confine Output.* graphics contexts to draw.c for now. + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/data.c, src/data.h: Remove unused global variable + Zoom_Multiplier Along with a following commented series of numbers which git log + suggests was originally related to pre-defined zoom ratios. + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/macro.h: macro.h: Remove unused (obsolete) conversion macro + TO_PCB + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Replace use of obsolete conversion macro + TO_PCB with a constant. This changes the location tolerance in NotifyLine()'s call to + LookupConnection() from what previously evaluated to 100 internal + units, to a constant of one internal unit. This is consistent with other similar calls to LookupConnection(), + where it appears that a wide search area is not desired, so the + smallest possible value is passed. + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/data.c, src/data.h, src/file.c: Remove unused variables Xorig + and Yorig + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/macro.h: macro.h: Remove unused, obsolete conversion macros + TO_PCB_X and TO_PCB_Y + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Partially fix up some stroke handling bugs 1. Stroke event coordinates are already in PCB units, drop bogus + conversions 2. Fix incorrect variable name + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/file.c: file.c: Write out correct cursor location in the PCB + file + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/data.c, src/data.h: data.c: Remove unused globals theScreen, + clipBox, vxl, vxh, vyl, vyh + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c, src/print.c, src/print.h: print.c: Pass an explicit + graphics context to PrintFab() and friends This is a step towards being able to move the active graphics + contexts out of the global scope. + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/global.h, src/main.c: Remove unused Output.GridGC variable + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/rtree.c: rtree.c: Remove old X11 based debug drawing code The core doesn't do drawing any more.. and can't assume that the + GUI's graphics contexts are actually X11 or GDK graphics context, so + this code can't work any more - remove it. + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/batch/batch.c, src/hid/common/extents.c, + src/hid/gerber/gerber.c, src/hid/gtk/gtkhid-gdk.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui.h, + src/hid/lesstif/main.c, src/hid/png/png.c, src/hid/ps/eps.c: HIDs: + Remove NOOP set_draw_faded implementations + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidnogui.c: hid: Provided non-CRASH default + implementation of HID->set_draw_faded There is no point in various HIDs providing their own NOOP + implementation + +2011-04-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid.h, src/hid/batch/batch.c, src/hid/common/extents.c, + src/hid/common/hidnogui.c, src/hid/gcode/gcode.c, + src/hid/gerber/gerber.c, src/hid/gtk/gtkhid-gdk.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui.h, + src/hid/lesstif/main.c, src/hid/nelma/nelma.c, src/hid/png/png.c, + src/hid/ps/eps.c, src/hid/ps/ps.c: hid: Remove unused + set_line_cap_angle API + +2011-04-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gui.h: hid/gtk: Make + ghid_show_crosshair() local to the GDK implementation + +2011-04-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Invalidate the crosshair + rather than drawing it immediately + +2011-04-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui.h: Revert "hid/gtk: Add hooks to tell the render + when we start/stop drawing" This reverts commit 332cb8ddc1cc032ac29c7d2b9a0051ccc228b6da. Since crosshair updates are now handled by notifications to the GUI, + this isn't required for the forthcoming PCB+GL support. + +2011-04-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-output-events.c: hid/gtk: Avoid extra crosshair + and attached object redraws The crosshair movement is handled by a notify_crosshair_change() + call in ghid_note_event_location(). + +2011-04-27 Andrew Poelstra * asp11 AT sfu dot ca * + + * globalconst.h, src/action.c, src/autoplace.c, src/buffer.c, + src/change.c, src/const.h, src/create.c, src/djopt.c, src/find.c, + src/hid/batch/batch.c, src/hid/gcode/gcode.c, + src/hid/gerber/gerber.c, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui-drc-window.c, src/hid/gtk/gui-misc.c, + src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h, + src/hid/lesstif/dialogs.c, src/hid/lesstif/lesstif.h, + src/hid/lesstif/main.c, src/hid/lesstif/styles.c, + src/hid/nelma/nelma.c, src/hid/png/png.c, src/hid/ps/eps.c, + src/hid/ps/ps.c, src/main.c, src/misc.c, src/parse_l.l, + src/print.c, src/report.c, src/vendor.c: PCB / Physical unit macros + patch Specify various constants in physical units, converting to PCB + internal units using macros. When reporting to the user (or + exporting), convert dimensions to physical units using macros so the + code does not rely on details of PCB's internal coordinates in so + many places. + +2011-04-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Remove old commented debug printf + +2011-04-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Remove unused function thin_callback() + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c, src/crosshair.h, src/global.h, + src/hid/lesstif/main.c: Move crosshair on / off functionality into + lesstif HID. Lesstif is the only GUI which turns attached objects on and off, + when the mouse leaves the viewport, so it might as well manage it + internally. + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c, src/hid.h, src/hid/common/hidnogui.c, + src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui.h, src/hid/lesstif/main.c: Give the HIDs control + over attached object (crosshair, mark) drawing This is required if a renderer doesn't want to follow the current + drawing model where it is assumed the core can call the HID's + drawing APIs at any arbitrary point in time. Expose some API from crosshair.c to perform the actual drawing on + demand, and add hooks to the HID structure to notify the GUI when it + would previously have called the crosshair or mark drawing routines. This allows renderers with defined setup and tear-down requirements + around drawing to execute them before the objects are drawn. CrosshairOn() and CrosshairOff() now simply set the Crosshair.On + flag and call the appropriate notification hooks. This commit replaces all HideCrosshair() and RestoreCrosshair() + calls with the new hooks notify_{crosshair|mark}_changed(), with an + argument specifying whether a change is about to happen (false + argument), or has been completed (true argument). + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Convert some explicit mark redrawing to + notification + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c, src/crosshair.h, src/set.c: Separate out mark + change notification from crosshair change notification Hook it up to notify the crosshair (which also redraws the mark) for + now. + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/buffer.c, src/crosshair.c, src/crosshair.h, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-misc.c, + src/hid/gtk/gui-output-events.c, src/hid/lesstif/main.c, + src/misc.c, src/set.c: Rename HideCrosshair() and RestoreCrosshair() Whist this is a tedious rename which will probably have implications + for some plugins, it helps to clarify what is going on with the + crosshair across forthcoming patches which put it under the control + of the GUIs. The old APIs are retained for backwards compatibility with plugins, + and will print a one-shot warning for each which is called. + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c: hid/gtk: DrawMark from + ghid_invalidate_all() as well as DrawAttached + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c, src/hid/gtk/gtkhid-gdk.c, + src/hid/gtk/gui-output-events.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: Let the GUIs manage the crosshair across a redraw Removes several {Hide/Restore}Crosshair() calls from the GTK HID. These are not requried any more, as they are followed by + invalidate_all() calls which take care of the crosshair as well. Changes to draw.c were tested not to affect Lesstif HID + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui.h: hid/gtk: Remove duplicated prototype + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Remove obsolete comment + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Remove clip_box global variable in favour of a + more targeted one Used for polygon clipping during drawing. + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: EraseRat() should just gather the affected + area These were missed (or incorrectly converted) in the previous patch + series which split gathering routines from drawing routines. Tidy up DrawRat() to be consistent with the new code in EraseRat() + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Separate out common code for drawing holes Makes things a bit clearer + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Remove Gathering variable This variable is no longer needed since the "Gathering" Draw* + functions are separate from the draw_... implementations which are + triggered by the GUI calling for a repaint of the gathered area. + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" routines from real drawing + routines (Text) Moves code from DrawRegularText() into its only caller + text_callback() + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" routines from real drawing + routines (Polygons) Moves code from DrawPlainPolygon() into its only caller + poly_callback() + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" routines from real drawing + routines (Arcs) + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" routines from real drawing + routines (Lines) + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" from real drawing routines + (Rats) + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" routines from real drawing + routines (Pads) + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" routines from real drawing + routines (Pins + Vias) + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" from real drawing routines + (Element Pins and Pads) + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" from real drawing routines + (Element names) + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" from real drawing routines + (Element Package) + +2011-04-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Split "Gathering" from real drawing routines + (Element) + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Fold DrawHole into its only caller, + hole_callback + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Move DrawPlainPin and DrawPlainVia into their + only callers Make their code part of pin_callback and via_callback. Drop the Gathering tests within this code, as their only callers are + within a block where Gathering is definately set. + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/autoplace.c, src/autoroute.c, src/draw.c, + src/draw.h, src/find.c, src/toporouter.c, src/vendor.c: draw.c: + Remove API ClearAndRedrawOutput(), in favour of Redraw(). These do the same thing anyway. + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/draw.c, src/draw.h, src/set.c: draw.c: Remove + UpdateAll() API, in favour of Redraw(), which is identical + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/draw.c, src/draw.h: draw.c: Expose local + Redraw() function, and remove wrapper RedrawOutput() Within the one caller ActionDisplay, combine the F_ClearAndRedraw + and F_Redraw cases which have exactly the same effect. + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Drop unused area parameters from Redraw(...) + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Only set Gathering during + hid_expose_callback() Removes setting of Gathering to false prior to calling UpdateAll() + in ClearAndRedrawOutput(), and removes setting of Gathering to true + after calling gui->invalidate_all() in Redraw() + +2011-04-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * : Regenerate test golden files for the png output hid The colour drawn for vias changed due to the fix in commit + c095adf5ea890284cddc2730944b980ac1275109 (Build was broken due to the above commit until commit + c9b915d7f2f49f5ebde0abeb5756b1e11e756edc) + +2011-04-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Use the ON_SIDE() macro rather then open-code + the test + +2011-04-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Add a DrawPaste() helper function for paste + layers + +2011-04-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/misc.c, src/misc.h: misc.c: Add query function IsPasteEmpty() + to query a paste layer is empty + +2011-04-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c, src/macro.h: Make the ON_SIDE() macro global, not + local do draw.c + +2011-04-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/draw_helpers.c: hid/common: Fix + common_thindraw_pcb_pad()'s handling of square pads I made a mistake in a logic test when simplifying this routine in + commit 4efcedeeac06cd4d5e559a7fe0a0ee8685f2137a This caused slanted rendering of horizontal or vertical pads. + +2011-04-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Rename the "screen" parameter of + DrawLayerGroup to "drawn_area" (For consistency with other code in draw.c) + +2011-04-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Use DrawPPV() where we can to save duplication + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Change PrintAssembly() to use a layer side + parameter Drops the "swap_ident" parameter in favour of a more explicit "side" + parameter. Also drops the side_group parameter, as we can easily + determine that from the requested side to draw. + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Change DrawSilk() to use a layer side + parameter, not SWAP_IDENT + +2011-04-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: Make DrawPPV() always draw for non gui HIDs, rather than doing_assy The gui HIDs don't accept the assembly drawaing, so testing for + !gui->gui will catch this case, and we can drop the doing_assy + override for PCB->PinOn and PCB->ViaOn + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Change DrawTop() to DrawPPV(), and teach it to + work for any layer (PPV stands for Pins, Pads and Vias). Extend its functionality to + work for pins and vias on any layer. + +2011-04-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Rename DrawTop() "screen" parameter + "drawn_area" For consistency with other code in draw.c + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Fix order of farside object drawing Backside silk should be drawn before bakside pads + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Add prototype for via_callback Fixes breakage since commit c095adf5ea890284cddc2730944b980ac1275109 + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Remove a couple of redundant if statements The outer if statement already ensures this code-path isn't followed + for a gui hid.. don't repeat ourselves. One statement will always + return false, hence is dead code - the other is always true. + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Use the via callback when drawing vias. Since this code-path is only hit for exporters, (and the only + difference between the pin and via callback is the drawing colour) + it is not likely this matters, but lets be correct. + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Add layer side parameter to DrawMask() Don't use the global variable SWAP_IDENT to choose which side to + draw. + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Combine front and back element and name + callbacks Pass an integer "side" parameter to determine which is desired + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/macro.h: Remove commented TEXT_IS_VISIBLE implementation I'm cleaning up code which uses SWAP_IDENT, and this comment scored + a hit. + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/change.c, src/copy.c, src/draw.c, src/draw.h, + src/find.c, src/hid/gtk/gui-drc-window.c, src/insert.c, src/move.c, + src/polygon.c, src/rats.c, src/remove.c, src/rotate.c, + src/select.c, src/toporouter.c, src/undo.c: draw.c: Remove unused + parameter from various calls: DrawObject DrawVia DrawViaName DrawLine DrawArc DrawText DrawRegularText DrawPolygon DrawElement DrawElementPackage DrawElementPackageLowLevel DrawElementName DrawElementPinsAndPads DrawRat DrawPin DrawPinName DrawPad DrawPadName + +2011-04-23 Andrew Poelstra * asp11 AT sfu dot ca * + + * src/hid/png/png.c: hid/png: Fix incorrect um unit conversion in + bloat parser. (Split from a larger patch by Peter Clifton * pcjc2 AT cam dot ac + dot uk *) + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * globalconst.h: globalconst.h: Remove some unused constants + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/png/png.c: hid/png: Fix segfault when no image formats are + configured in. Based on a patch by Felix Ruoff * Felix AT posaunenmission dot de * Catch the case where the selected image format is actually the NULL + terminator at the end of the format list. This happens when the list + is empty. Don't strcmp against that terminator! Closes-bug: lp-699290 (sf-2669324) + +2011-04-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/png/png.c: Revert "Fix potential segfault" This reverts commit 2d2040e92d5ebb069af42567855055b096532e71. This patch causes segfaults in the GTK and Lesstif hids, so + reverting, as it removes the required NULL termination from an + attribute enumeration. Any code which can't deal with an empty + enumeration list should be fixed instead. Reopens-bug: lp-699290 (sf-2669324) Closes-bug: lp-769336 + +2011-04-22 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/main.c, src/misc.c, src/polygon.c, src/polygon.h, + src/thermal.c: Fix geometry errors caused by commit + 2d8dc8a3a3a55158b4e6278dd9f40588e4111c2d This fixes up problems from the following commit: [PATCH] fix bug 2793480 (vias/arcs-to-polygon clearances) frac_circle(): introduce radius_adjustment factor to make the polygon outline the arc rather than connet points on the arc ArcPolyNoIntersect(): compute number of segments so that polygon diverges from the arc no more than 0.02 of required thickness; adjust outer "arc" radius like in + frac_circle() The object bounding boxes for arcs, vias, lines and rounded pads + which determine the maximum area affected by that object were no + longer correct, leading to artaefacts when doing incremental polygon + processing. It also lead to missing fragments in (the non-curved + and x type + thermals). These are also fixed up by this patch. + +2011-04-21 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Tidy up hole_callback routine + +2011-04-21 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Remove unnecessary pin_info struct. The argument specifying whether to clear pins was always true in any + case where clearPin_callback was called (the only user of this + info). + +2011-04-21 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/macro.h: macro.h: Remove unused X11 specific macros + +2011-04-21 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/macro.h: macro.h: Remove unused object visibility macros + +2011-04-21 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c, src/line.c, src/macro.h: Remove some old unused + coordinate conversion macros from the core Sadly, there are still some left to expunge which are being used - + and their usage appears broken in many cases! + +2011-04-21 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * tests/golden/hid_gcode1/Makefile.am, + tests/golden/hid_gcode10/Makefile.am, + tests/golden/hid_gcode11/Makefile.am, + tests/golden/hid_gcode2/Makefile.am, + tests/golden/hid_gcode3/Makefile.am, + tests/golden/hid_gcode4/Makefile.am, + tests/golden/hid_gcode5/Makefile.am, + tests/golden/hid_gcode6/Makefile.am, + tests/golden/hid_gcode7/Makefile.am, + tests/golden/hid_gcode8/Makefile.am, + tests/golden/hid_gcode9/Makefile.am, + tests/golden/hid_gerber1/Makefile.am, + tests/golden/hid_gerber2/Makefile.am: Fix test-suite harder Fixup Makefile.am files to match renames in last commit + +2011-04-21 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * tests/golden/hid_gcode1/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode1/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode1/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode1/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gcode10/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode10/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode10/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode10/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gcode11/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode11/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode11/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode11/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gcode2/out.back.cnc, + tests/golden/hid_gcode2/out.bottom.cnc, + tests/golden/hid_gcode2/out.front.cnc, + tests/golden/hid_gcode2/out.top.cnc, + tests/golden/hid_gcode3/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode3/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode3/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode3/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gcode4/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode4/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode4/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode4/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gcode5/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode5/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode5/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode5/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gcode6/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode6/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode6/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode6/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gcode7/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode7/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode7/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode7/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gcode8/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode8/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode8/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode8/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gcode9/gcode_oneline.gcode.back.cnc, + tests/golden/hid_gcode9/gcode_oneline.gcode.bottom.cnc, + tests/golden/hid_gcode9/gcode_oneline.gcode.front.cnc, + tests/golden/hid_gcode9/gcode_oneline.gcode.top.cnc, + tests/golden/hid_gerber1/gerber_oneline.back.gbr, + tests/golden/hid_gerber1/gerber_oneline.bottom.gbr, + tests/golden/hid_gerber1/gerber_oneline.front.gbr, + tests/golden/hid_gerber1/gerber_oneline.top.gbr, + tests/golden/hid_gerber2/out.back.gbr, + tests/golden/hid_gerber2/out.bottom.gbr, + tests/golden/hid_gerber2/out.front.gbr, + tests/golden/hid_gerber2/out.top.gbr, tests/tests.list: Fix + test-suite files to match component->front and solder->back rename Test-suite now passes again. + +2011-04-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: hid/common: Draw the hole outline for pins / vias + being moved or placed + +2011-04-21 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: crosshair.c: Use a dummy via structure to draw + vias being created + +2011-04-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c, src/draw.c, src/global.h, src/hid.h, + src/hid/common/draw_helpers.c, src/hid/common/draw_helpers.h, + src/hid/common/hidnogui.c: Consolidate pin / via drawing routines, + moving them under the HID API Adds two new HID APIs, fill_pcb_pv and thindraw_pcb_pv, splitting + drawing code from DrawPadLowlevel() to common_fill_pcb_pv() and + common_thindraw_pcb_pv() in hid/common/draw_helpers.c. Octagonal vias and pins are now correctly drawn when attached to the + cursor. + +2011-04-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c, src/draw.c, src/global.h, src/hid.h, + src/hid/common/draw_helpers.c, src/hid/common/draw_helpers.h, + src/hid/common/hidnogui.c: Consolidate pad drawing routines, moving + them under the HID API Adds two new HID APIs, fill_pcb_pad and thindraw_pcb_pad, splitting + drawing code from DrawPadLowlevel() to common_fill_pcb_pad() and + common_thindraw_pcbpad() in hid/common/draw_helpers.c. I simplified the code somewhat as I moved it, reducing the number of + special cases. gui->{thindraw|fill}_pcb_pad() is called from DrawPadLowlevel(), and + is used to replace an incomplete thindraw implementation for pads in + XORDrawElement(). Outlines for angled pads are now drawn in their entirety when + attached to the cursor, not just their center line, and rounded end + pads are also now drawn correctly in this mode. + +2011-04-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/batch/batch.c, src/hid/common/draw_helpers.c, + src/hid/common/draw_helpers.h, src/hid/common/extents.c, + src/hid/gcode/gcode.c, src/hid/gerber/gerber.c, + src/hid/gtk/gtkhid-main.c, src/hid/lesstif/main.c, + src/hid/nelma/nelma.c, src/hid/png/png.c, src/hid/ps/eps.c, + src/hid/ps/ps.c: hid/common: Provide a helper function for HIDs to + use drawing helpers Gives the following changes to various HIDs: extents: now has thindraw_polygon implemented - should not be an + issue gcode: now has thindraw_polygon implemented - should not + be an issue gerber: now has thindraw_polygon implemented - should + not be an issue nelma: now has thindraw_polygon implemented - + should not be an issue png: now has thindraw_polygon implemented + - should not be an issue eps: now has thindraw_polygon + implemented - should not be an issue ps: now has + thindraw_polygon implemented - should not be an issue batch: no + longer has NOP fill_pcb_polygon and thindraw_pcb_polygon routines - + should not be an issue, as the drawing calls the common helper + routines use are still NOPs for the batch HID. + +2011-04-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/draw_helpers.c: hid/common: Some formatting changes + in draw_helpers.c + +2011-04-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gcode/gcode.c, src/hid/png/png.c: Add missing HID + structure zero initialisation for gcode and png HIDs. Missed from commit commit d67f4335b5d4f97330448b833ea1bf04377c3a57 "Initialise the HID vtable by function, rather than as a struct + initialiser." I missed the memset from these two HIDs. + +2011-04-19 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Fix damage area computation We should reset the left and top bounds to MAXINT, and the right and + bottom bounds to -MAXINT. This way the correct bounds are computed + when gathering. The code previously every coordinate to 0, meaning that the box + encompasing (0, 0) up to the (max_x, max_y) would be invalidated, + rather than (min_x, min_y) to (max_x, max_y). No improvement is going to be seen, as both the GTK and Lesstif GUIs + ignore the damaged bounds and repaint the whole screen each time - + it is just for correctness. + +2011-04-18 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c, src/crosshair.h, src/hid/lesstif/main.c: Don't + abuse CrosshairOn() API to force a redraw. Expose DrawAttached() to the HIDs so they can call it themselves, + and don't have to cheat by forcing Crosshair.On to false. Make DrawAttached() and DrawMark() a NOP if the relevant item is not + being shown. Ie. if !Crosshair.On, both functions draw nothing. If + !Marked.status, DrawMark() draws nothing. A minor change is required in CrosshairOff() to XOR un-draw before + switching the flag to off. Not known to fix any particular bug, but it is possible that the + crosshair should not be drawn at a given point (due to changes + taking place inside a HideCrosshair() / RestoreCrosshair() pair. Tested with Lesstif and GTK HIDs. + +2011-04-18 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c, src/hid/gtk/gui-output-events.c: hid/gtk: Don't + call CrosshairOn() when re-entering the viewport The GTK HID doesn't turn the crosshair off, so we don't turn it back + on if we default to having it switched on in the first place. Make + that default change, and remove the CrosshairOn() call. (Also tested not to break the Lesstif HID). + +2011-04-18 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/Makefile.am, src/hid/batch/batch.c, src/hid/bom/bom.c, + src/hid/common/extents.c, src/hid/gcode/gcode.c, + src/hid/gerber/gerber.c, src/hid/gtk/gtkhid-main.c, + src/hid/lesstif/main.c, src/hid/lpr/lpr.c, src/hid/nelma/nelma.c, + src/hid/nelma/nelma.h, src/hid/png/png.c, src/hid/png/png.h, + src/hid/ps/eps.c, src/hid/ps/ps.c: Initialise the HID vtable by + function, rather than as a struct initialiser. This allows adding new items without having to update every HID. It + also reduces bloat for those HIDs which have a lot of zero entries. + +2011-04-12 DJ Delorie * dj AT delorie dot com * + + * src/misc.c: Add t/b synonyms for group list Allow 't' as well as 'c', and 'b' as well as 's', in the groups + string. + +2011-03-31 Ineiev * ineiev AT users dot berlios dot de * + + * src/hid/png/png.c: Fix potential segfault Closes-bug: lp-699290 (sf-2669324) + +2011-04-11 DJ Delorie * dj AT delorie dot com * + + * src/hid/common/flags.c: Update file names to top/bottom convention Yes, I know this will break some scripts - mine included. I + couldn't think of a good way to auto-detect when the old names + should be used. + +2011-04-11 DJ Delorie * dj AT delorie dot com * + + * src/draw.c: Remove (now) unused variable. + +2011-04-11 DJ Delorie * dj AT delorie dot com * + + * src/draw.c: Don't draw an empty outline layer. If the design has an outline layer, and it's empty, draw an outline + anyway - around the whole work area. + +2011-04-11 DJ Delorie * dj AT delorie dot com * + + * src/hid/ps/ps.c: Fix PS rect/outline logic PS's draw_rect was actually doing a fill_rect. Fixed. If the design has an outline layer, draw it in more of the cases + where we would draw the synthetic outline. + +2011-04-11 DJ Delorie * dj AT delorie dot com * + + * src/misc.c, src/misc.h: Add IsEmpty functions Add functions to test if a given layer or layer group is "empty" - + i.e. has none of its own drawing items on it. + +2011-04-11 DJ Delorie * dj AT delorie dot com * + + * src/hid/gerber/gerber.c: Fix gerber output Use the correct DRC minimums for drawn outlines on silk and copper + layers. Draw rectangles as unfilled, not filled. + +2011-04-11 DJ Delorie * dj AT delorie dot com * + + * src/main.c: Tweak default layer stack. Change the default layer stack to reflect a six layer board, + allowing for 2 or 4 layer designs with the same stack. Add an + outline layer by default. Change the default names from + "component/solder" to "top/bottom" to be consistent with names used + by popular packages. + +2011-04-08 Krzysztof Kościuszkiewicz * k dot kosciuszkiewicz AT gmail dot com * + + * src/gpcb-menu.res, src/pcb-menu.res: Change menu location of "Move + to current layer" To be consistent with other menu actions (like Flip/Flip selected): * "Move to current layer" is now located in the Info > Key + bindings, * "Move selected to current layer" is now located in the + Select menu. Closes-bug: lp-699106 + +2011-04-01 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gtk/gui-dialog.c: hid/gtk: Select adequate folder in + file-save-dialog Since now, the 'Save layout as' - dialog gives full path and + filename in name-line, but did not switches to given path in + folder-list (lower part of the dialog). For me, this is + uncomfortable, e.g. if I just want to switch to another near-by - + folder. This solution was suggested by Krzysztof Kościuszkiewicz. Thank + you! Closes-lp: 699491 Reviewed-by: Krzysztof Kościuszkiewicz * k dot + kosciuszkiewicz AT gmail dot com * + +2011-04-07 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gtk/gui-library-window.c: hid/gtk: expand library tree + after filtering This patch changes the behavior of the library selection dialog. + After filtering by name is applied the tree view of matching + components is automatically expanded so that all leafs are + immediately selectable. The tree view is collapsed when the filter + is cleared. Patch is adapted from Krzysztof Kosciuszkiewicz's patch for gschem. Closes-bug: lp-753643 Reviewed-by: Krzysztof Kościuszkiewicz * k + dot kosciuszkiewicz AT gmail dot com * + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-output-events.c, src/hid/gtk/gui.h: hid/gtk: + Consolidate the mechanisms used for holding off scrollbar updates Don't duplicate mechanisms - it is confusing! + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Remove unused variables + from {h,v}_adjument_changed_cb() + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gui-output-events.c: + hid/gtk: Only redraw the crosshair when necessary If we're about to repaint the screen from our backing pixmap, there + is no point un-XOR drawing our current crosshair first. + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: Don't issue CrosshairOff() from the + DestroyCrosshair() function. We shouldn't assume we can make call GUI calls at this point. NB: The DestroyCrosshair() function is actually unused! + +2011-04-05 Ed Maste * emaste AT freebsd dot org * + + * configure.ac: Small change to get pcb to build on FreeBSD Add check for wish 8.5 + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Remove some unneded crosshair hide/restore + calls Removed calls from various actions which should not have any effect + on the objects drawn attached to the crosshair. + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: In ActionLoadFrom(), only hide the + crosshair where required + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: In ActionUnselect(), only hide the + crosshair where required + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: In ActionSelect(), only hide the crosshair + where required + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: In ActionDisplay(), Only invalidate + crosshair where needed Rather than wrapping the whole function in a crosshair hide/restore, + only do it for the sub-paths which require it. + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Combine the crosshair / restore for all + paths in click_cb() Reduces code duplication in the different sub-paths of this routine. + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/buffer.c, src/hid/gtk/gui-command-window.c, + src/report.c: Don't undraw the crosshair attached object when + showing dialogue prompts + +2011-04-06 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Remove commented out line of code Left from commit 089fbaf59c78fe75475db737e7e2827cd745d570 (Initial + C++ compatibility patch) + +2011-04-03 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * : Commit hook test This commit is deliberately blank, but should close bug lp-700413 + due to the line below. Closes-bug: lp-700413 + +2011-02-11 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/draw.c: Remove unused function DrawVText() used GDK; it shouldn't have been implemented this way in + any case. Closes-bug: lp-717294 + +2011-03-23 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gtk/gui-dialog-print.c: Fix warning at exporting png with + GTK+ GUI An 'Gtk-CRITICAL'-Error was thrown on opening the png-exporter + dialog because there is no default-string for the 'png-bloat' + option. Closes-bug: lp-740526 + +2011-03-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c: crosshair.c: Remove comment which is no longer + relevant + +2011-03-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/buffer.c, src/crosshair.c, src/crosshair.h, + src/draw.c, src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui-command-window.c, src/hid/gtk/gui-misc.c, + src/hid/gtk/gui-output-events.c, src/hid/gtk/gui-top-window.c, + src/hid/lesstif/main.c, src/misc.c, src/report.c, src/set.c: Remove + BlockToo argument from various crosshair hide / restore functions Goodness knows what it is supposed to do, but everything appears to + work fine without it. For the majority of cases, the argument passed + is true. When passed as false, the effect is to surpress drawing an attached + selection / rubberband rectangle in the AttachedBox.state == + STATE_THIRD state. Digging through the version control history, this code appears to + have been present since the project was initially placed under CVS + control. The 23 places this argument was previously false are: ActionMovePointer - HideCrosshair (false); - RestoreCrosshair (false); EventMoveCrosshair - RestoreCrosshair (false); ActionDisplay - RestoreCrosshair (false); ActionFreeRotateBuffer - HideCrosshair(false); - RestoreCrosshair(false); MoveCrosshairAbsolute - HideCrosshair (false); ghid_invalidate_all - RestoreCrosshair (FALSE); ScrollAction (GTK HID) - HideCrosshair (FALSE); - RestoreCrosshair (FALSE); ghid_port_ranges_changed - HideCrosshair (FALSE); ghid_note_event_location - RestoreCrosshair (false); idle_proc (Lesstif HID) - CrosshairOn (0); CenterDisplay - RestoreCrosshair(false); ReportDialog - HideCrosshair (false); - RestoreCrosshair (false); ReportFoundPins - HideCrosshair (false); - RestoreCrosshair (false); ReportNetLength - HideCrosshair (false); - RestoreCrosshair (false); SetLocalRef - RestoreCrosshair (false); - HideCrosshair (false); - RestoreCrosshair (false); + +2011-03-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/crosshair.c, src/crosshair.h: Remove visibility + overriding argument from DrawMark() Because of the places it was used, we can gaurantee this doesn't + change any behaviour - the mark visibility status is always correct, + so doesn't need overriding. + +2011-03-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c: hid/gtk: g_return_if_reached() for + receipt of gui->use_mask(HID_MASK_BEFORE) This means one less untranslated printf which is never hit. If for + some reason the core sends us one of these - logging a warning and + continuing is probably better than a hard abort() + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Don't make GUI drawing calls to erase objects Changing the colour here is unnecessary (as drawing is deferred). + Delete the gui->set_color() calls. + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/change.c, src/find.c: Allow zero clearance pads and pins to + touch polygons This was already supported for vias, lets be consistent. + +2011-03-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Fix mask drawing at high zooms (only draw the + bit on-screen) This probably papers over a bug in the GTK hid's fill_rect routine, + as the only reason this should fix anything is because it avoids + coordinate overflow at high zoom. The GTK hid really ought to clip coords to the screen before + transforming them for rendering. + +2011-03-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: draw.c: Tidy up mask drawing code Since the gerber HID now supports putting the outline on various + layers, we can also safely remove the commented out code for doing + that in draw.c + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Make benchmark() + implementation suit multiple drawing models Invalidate and process updates, rather than calling redraw directly. + This suits the coming GL renderer which will use an + invalidate/expose model. + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui.h: hid/gtk: Move set_layer function into GDK + specific code. Not that this is particularly GDK specific, just that the GL + renderer hopefully coming soon needs to do some extra work. + +2011-03-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui.h: hid/gtk: Add hooks to tell the render when we + start/stop drawing This is necessary if the renderer requires certain state to be + configured before its drawing calls can be operated. + +2011-03-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gui-pinout-preview.c, + src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: hid/gtk: Add hooks + for the renderer to initalise drawing widgets + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Remove some unnecessary + gtk_widget_realize() calls. + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gerber/gerber.c: hid/gerber: Remove unused variables + outline_trace_size and absolute Left over accidentally from commit + 35b137c3e193471e07f0873dfb149cebd059dca2 + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui-top-window.c, src/hid/gtk/gui.h: hid/gtk: Create a + private structure for the gdk render backend This is in an effort to isolate some of its internals from the rest + of the GTK hid. Also create a hook for configure events on the main drawing area to + allow the renderer to reconfigure its-self as necessary as the area + changes in size. + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/Makefile.am, src/hid/gtk/gtkhid-gdk.c, + src/hid/gtk/gui-output-events.c, src/hid/gtk/gui-pinout-preview.c, + src/hid/gtk/gui-render-pixmap.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: hid/gtk: Move more GDK specific routines to + gtkhid-gdk.c + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gerber/gerber.c: hid/gerber: Remove option for thickness + of auto-generated outline layer We don't mess with the thickness of the user's hand-drawn outline, + and this option implies that we do. I cannot think of a sensible way + to present the option without confusing the user, so lets remove it. Whilst the previous default of 10 mil was fine, 8 mil matches the + width used on the fab drawing, so I have changed to that value. + +2011-03-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/print.c: src/print.c: Fix fab drawing width text annotation. The text hard-coded that the outline is 10mil, in fact it is not, + the current #define sets it at 8 mil. Report the actual value used. + +2011-03-23 Ineiev * ineiev AT users dot berlios dot de * + + * src/hid/gtk/gui-misc.c: suppress annoying decimals in relative + coordinates The threshold for non-aligned object is increased because in case of + relative coordinates the round-off error may double. Closes-bug: lp-699452 (sf-2117383) Closes-bug: lp-699169 + (sf-1741659) + +2011-03-22 DJ Delorie * dj AT delorie dot com * + + * src/file.c, src/global.h: Save footprints as footprints. If the user loads a footprint as a PCB (i.e. File->Load) and tries + to save it, save only the elements in the pcb, not the whole pcb. + +2011-03-22 DJ Delorie * dj AT delorie dot com * + + * src/misc.c, src/misc.h: Fix mkdir() in plugins. Plugins include misc.h without having a valid config.h, which meant + they'd get a build error. This patch moves the error check into + pcb's misc.c, which always has a config.h, and lets plugins have a + MKDIR() macro that uses pcb's detected values. + +2011-03-22 DJ Delorie * dj AT delorie dot com * + + * src/hid/gerber/gerber.c: Add copy-outline mode New gerber export options to copy the outline layer onto one or more + other layers. Some fabs want the outline separate; others want it + on a "working" layer. + +2011-03-22 DJ Delorie * dj AT delorie dot com * + + * src/misc.c: Allow space between value and units in GetValue(). + +2011-03-22 Ineiev * ineiev AT users dot berlios dot de * + + * src/polygon.c: simplify an expression return to the form written in d5d894d977e610 (lost in + 2d8dc8a3a3a551) + +2011-03-06 Ineiev * ineiev AT users dot berlios dot de * + + * src/action.c, src/const.h, src/crosshair.c, src/gpcb-menu.res, + src/hid/gtk/gui-misc.c, src/misc.c, src/misc.h, src/pcb-menu.res, + src/set.c, src/set.h: (GTK HID) fix annoying decimals When in metric grid mode, the coordinates are displayed with + irregular tails of nines, e.g. "116.9998 43.9999" when the grid is + set to 1mm. The fix includes using more precise metric-to-imperial and crosshair + calculations and fitting crosshair values into metric grids. To address the issue in a really reliable way we need at least one + more separate variable, to explicitly mark the grid as metric (as + opposed to the displayed units); this flag should also be saved in + PCB files. First reported by Kai-Martin Knaak. Closes-bug: lp-699452 (sf-2117383) Closes-bug: lp-699169 + (sf-1741659) + +2009-11-27 Ineiev * ineiev AT users dot berlios dot de * + + * doc/pcb.texi: fix sections hierarhy + +2010-12-07 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/action.c, src/buffer.c, src/djopt.c, src/fontmode.c, + src/hid/gtk/gui-top-window.c, src/move.c: Cleanup action + documentation Add missing documentation * Display(ToggleLockNames) * Display(ToggleOnlyNames) * Select(Object) Remove invalid documentation * Connection(Measure) * Display(Scroll, Direction) * Display(Step, direction, amount, units) Cosmetic modifications: * dots at end of sentences * capital letter at start of sentences * remove some curious signs at the beginning of some lines. * fix a couple of typos Closes-bug: lp-699506 + +2011-03-12 DJ Delorie * dj AT delorie dot com * + + * src/misc.h: Make io.h inclusion conditional on the mingw case. + +2011-01-23 Bob Paddock * bobpspam AT gmail dot com * + + * configure.ac, m4/m4_ax_func_mkdir.m4, src/hid/common/hidinit.c, + src/hid/gtk/gui-config.c, src/misc.h: mkdir() takes only one + argument under WIN32. Add check whether mkdir() is mkdir or _mkdir, and whether it takes + one or two arguments. WIN32 mkdir takes one argument and POSIX + takes two. Use MKDIR() macro from misc.h everyplace to get correct behavior + depending on platform. + +2011-01-23 Bob Paddock * bobpspam AT gmail dot com * + + * configure.ac, src/action.c, src/hid/png/png.c, src/main.c: Use + rand() in place of random(). The 'random', 'srandom', functions are those from BSD derived + UNIX's, and may not be available under WIN32. The 'rand' and + 'srand' functions are required by the ANSI standard. rand(): Return a random integer between 0 and RAND_MAX inclusive. + random(): Return a random long integer between 0 and RAND_MAX + inclusive. Standard MinGW stdlib.h only supports rand() and RAND_MAX is limited + to the 32 bit value of 32767, which is significantly smaller than + that returned by random(). This turncation of range should not + effect usage in our application. Added srand( time(NULL) ) to main.c to set the seed. + +2010-12-31 Bert Timmerman * bert dot timmerman AT xs4all dot nl * + + * po/LINGUAS: Added an entry for the Dutch translation in LINGUAS. + +2010-12-31 Bert Timmerman * bert dot timmerman AT xs4all dot nl * + + * po/nl.po: First issue of the Dutch translation. + +2011-02-14 Krzysztof Kosciuszkiewicz * k dot kosciuszkiewicz AT gmail dot com * + + * src/hid/gtk/gui-library-window.c: hid/gtk: handle CTRL-C in + library window Handle CTRL-C keypress in library window and copy name of the + selected component into the default GTK clipboard. The change facilitates workflow where one browses footprints in pcb + and copies component names into gattrib or gschem. + +2011-03-10 Felix Ruoff * Felix AT posaunenmission dot de * + + * doc/pcb.texi: Describe layer groupings in GTK+ GUI Add information to the documentation where the 'Edit Layer Grouping' + option can be found in the GTK+ GUI. Closes-bug: lp-699175 + +2011-03-07 Kai-Martin Knaak * kmk AT lilalaser dot de * + + * doc/pcb.texi: expand the regexp appendix in pcb manual * Add special character "|" to concatenate * Add special character $" to denote the end of a string * Mention the special meaning of brackets. * Make the table of examples conform to "example -> description" rather than the other way round. * Add examples for the use of "|", "[]" and "{}". Closes-bug: lp-723931 + +2011-01-31 Markus Hitter * mah AT jump-ing dot de * + + * gts/.gitignore, tests/.gitignore: Clean up "git status" output. Closes-bug: lp-710719 + +2011-02-25 Stephen Ecob * silicon dot on dot inspiration AT gmail dot com * + + * src/draw.c: better heuristics for paste openings Prohibit paste windows wider than mask ones (suggested by Kai-Martin + Knaak). Suppress zero width paste windows (suggested by DJ Delorie). Discussed on + http://www.seul.org/pipermail/geda-user/2011-February/052413.html Closes-bug: lp-718342 + +2011-02-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: Fix auto-router - we need to actually increment + the dir variable! Was broken accidentally in commit + 5f0f788dc12a10a3c01ade7cf00d5ed63922ca47 (Initial C++ compatibility patch) + +2011-02-21 Ineiev * ineiev AT users dot berlios dot de * + + * src/polygon.c: fix polygon regression Introduced by 2d8dc8a3a3a55158b4e6278dd9f40588e4111c2d Reported by Kai-Martin Knaak + +2011-02-19 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/draw.c: Fix solder mask drawing glitch in pcb Applied patch from lp-699498 by rdrehmel Closes-bug: lp-699498 + +2011-02-10 DJ Delorie * dj AT delorie dot com * + + * src/strflags.c: Use onsolder for text, not auto. The flags table wasn't using onsolder for text, which meant the + default "auto" was used for it, which doesn't make sense. This + makes text on the solder side use the "onsolder" name instead. + +2011-01-27 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/main.c: Conditionally use "class" or "c_class" + depending on the compiler language. The X11 headers define some classes differently based on whether + they're being used for C or C++, so we have to make our access to + them conditional also. + +2011-01-27 DJ Delorie * dj AT delorie dot com * + + * src/hid/batch/batch.c: C++ compatibility for the batch HID. Just a keyword rename (xor). + +2011-01-27 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/dialogs.c, src/hid/lesstif/lesstif.h, + src/hid/lesstif/main.c, src/hid/lesstif/menu.c, + src/hid/lesstif/styles.c: C++ compatibility for the lesstif HID. Minor changes - casts, consts, keyword renames, so that the lesstif + HID can be compiled as C or C++. + +2011-01-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/change.c: change.c: Restore and clear to polygons when + changing hole sizes This is more consistent with other code-paths and is useful if the + thermal gemoetry were to depend in on the hole size (which it + doesn't currently, but used to do before the clipper branch). + +2011-01-24 Markus Hitter * mah AT jump-ing dot de * + + * configure.ac: configure.ac: remove the now obsolete test for + gethostname(). No longer required since commit + 00c556b02dfa0113eab62b894eff4cf5d55b8e5f Reviewed-by: Peter Clifton * pcjc2 AT cam dot ac dot uk * + Affects-bug: lp-703914 + +2011-01-23 Markus Hitter * mah AT jump-ing dot de * + + * doc/gs/fb-blinker.pcb, doc/gs/fb-led-5.pcb, doc/gs/fb-led.pcb, + doc/gs/fb-smt.pcb, doc/gs/term-annulus-1.pcb, + doc/gs/term-clearance-1.pcb, doc/gs/term-element-1.pcb, + doc/gs/term-pad-1.pcb, doc/gs/term-pin-1.pcb, + doc/gs/term-platedhole-1.pcb, doc/gs/term-tented-1.pcb, + doc/gs/term-thermal-1.pcb, doc/gs/term-thickness-1.pcb, + doc/pad.pcb, doc/puller.pcb, doc/thermal.pcb, example/LED.pcb, + example/LED2.pcb, tests/inputs/bom_general.pcb, + tests/inputs/gcode_oneline.pcb, tests/inputs/gerber_oneline.pcb, + tutorial/tut1.pcb: Remove all date, user and host comments on all + test and sample files. These items are no longer written, so sample files shouldn't contain + them either. Usually, this was line 2...4. Reviewed-by: Peter Clifton * pcjc2 AT cam dot ac dot uk * + Affects-bug: lp-703914 + +2011-01-23 Markus Hitter * mah AT jump-ing dot de * + + * src/file.c: src/file.c: don't write user name or date to the + stored layout file. Notes from Peter Clifton: The consensus from bug lp-703914 was that that recording the + username, data and host which produced the file is unnecessary and + causes version control clashes which are otherwise unnecessary. Reviewed-by: Peter Clifton * pcjc2 AT cam dot ac dot uk * + Closes-bug: lp-703914 + +2011-01-22 Bob Paddock * bobpspam AT gmail dot com * + + * src/action.c: Compiling with MinGW requires cast to const for + _spawnvp to compile without warning. + +2011-01-22 Bob Paddock * bobpspam AT gmail dot com * + + * src/hid/gcode/gcode.c, src/hid/nelma/nelma.c: Add missing + Message() prototype to remove warning about same. + +2011-01-22 Bob Paddock * bobpspam AT gmail dot com * + + * src/polygon1.c: Initialize min_dist to zero before using in if(). + +2011-01-23 Newell Jensen * pillar2012 AT gmail dot com * + + * configure.ac, src/action.c, src/autoplace.c, src/autoroute.c, + src/change.c, src/create.c, src/dbus-pcbmain.c, src/draw.c, + src/drill.c, src/edif.y, src/file.c, src/find.c, src/free_atexit.c, + src/global.h, src/heap.c, src/hid.h, src/hid/bom/bom.c, + src/hid/common/actions.c, src/hid/common/draw_helpers.c, + src/hid/common/extents.c, src/hid/common/flags.c, + src/hid/common/hid_resource.c, src/hid/common/hidinit.c, + src/hid/common/hidnogui.c, src/hid/gcode/gcode.c, + src/hid/gerber/gerber.c, src/hid/gtk/gtkhid-gdk.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-command-window.c, + src/hid/gtk/gui-config.c, src/hid/gtk/gui-dialog-print.c, + src/hid/gtk/gui-dialog-size.c, src/hid/gtk/gui-dialog.c, + src/hid/gtk/gui-drc-window.c, src/hid/gtk/gui-library-window.c, + src/hid/gtk/gui-log-window.c, src/hid/gtk/gui-misc.c, + src/hid/gtk/gui-netlist-window.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui-pinout-preview.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui-utils.c, src/hid/gtk/gui.h, src/hid/nelma/nelma.c, + src/hid/png/png.c, src/hid/ps/eps.c, src/hid/ps/ps.c, src/insert.c, + src/intersect.c, src/main.c, src/misc.c, src/move.c, src/mtspace.c, + src/mymem.c, src/netlist.c, src/parse_l.l, src/parse_y.y, + src/polygon.c, src/polygon1.c, src/puller.c, src/rats.c, + src/rats.h, src/report.c, src/rtree.c, src/toporouter.c, + src/undo.c, src/vector.c, src/vendor.c: Initial C++ compatibility + patch Doesn't cover lesstif or batch hids. Makes source code build + without warnings on C, and build with warnings on C++. + +2011-01-23 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/netlist.c: Add header for Draw() prototype. Silences a warning building the lesstif hid. + +2011-01-23 DJ Delorie * dj AT delorie dot com * + + * src/edif.y: FindContext() takes an int, not a pointer. + +2011-01-14 Markus Hitter * mah AT jump-ing dot de * + + * INSTALL: INSTALL: add instructions on how to create configure. Closes-bug: lp-702484 + +2011-01-07 Jared Casper * jaredcasper AT gmail dot com * + + * configure.ac: Heed and remove warning issued by autoconf 2.68. Starting in autoconf 2.68, "the macros AC_PREPROC_IFELSE, + AC_COMPILE_IFELSE, AC_LINK_IFELSE, and AC_RUN_IFELSE now warn if the + first argument failed to use AC_LANG_SOURCE or AC_LANG_PROGRAM to + generate the conftest file contents." Closes-bug: lp-700180 Reviewed-by: Peter Clifton * pcjc2 AT cam dot ac * + +2009-02-20 Ineiev * ineiev AT users dot sourceforge dot net * + + * src/hid/gtk/gui-output-events.c: hid/gtk: Fix disappearing + reference mark Fixes the following symptoms (Bug sf-1882970 reported by Steven + Michalske): (0) when the cursor leaves the window, the mark disappears (with attached objects); when the cursor enters again, the mark is redrawn only if there are any attached objects; (1) When there are no attached objects, the mark disappears on button press, but is not redrawn again when button press and release form a click. (Commit message edited by Peter Clifton * pcjc2 AT cam dot ac dot + uk *) Reviewed-by: Peter Clifton * pcjc2 AT cam dot ac dot uk * Closes-bug: lp-699244 Closes-bug: lp-699453 + +2011-01-11 DJ Delorie * dj AT delorie dot com * + + * src/hid/lpr/lpr.c, src/hid/ps/ps.c: Fix postscript page scaling Calculate page sizes *after* selecting the page, not before. + +2011-01-10 DJ Delorie * dj AT delorie dot com * + + * src/misc.c: Calculate text bounding boxes based on that actual + drawn glyphs. Previously, a text's bounding box was calculated based on overall + font metrics, not the actual glyphs. This meant that text clearing + a polygon would have far more space around it than called for. + +2011-01-10 DJ Delorie * dj AT delorie dot com * + + * src/file.c: Make new PCB active during parsing Set the global PCB pointer to the "new" pcb while it's being loaded. + Some of the creation functions use the DRC values in PCB to compute, + for example, bounding boxes. Before, it used whatever was hanging + around in the previous PCB (or the default values). + +2011-01-09 DJ Delorie * dj AT delorie dot com * + + * Makefile.am, configure.ac, gts/.gitignore, gts/Makefile.am, + gts/NOTES, gts/bbtree.c, gts/boolean.c, gts/cdt.c, gts/container.c, + gts/curvature.c, gts/edge.c, gts/eheap.c, gts/face.c, gts/fifo.c, + gts/graph.c, gts/gts-private.h, gts/gts.h, gts/heap.c, + gts/hsurface.c, gts/iso.c, gts/isotetra.c, gts/kdtree.c, + gts/matrix.c, gts/misc.c, gts/named.c, gts/object.c, gts/oocs.c, + gts/partition.c, gts/pgraph.c, gts/point.c, gts/predicates.c, + gts/predicates.h, gts/psurface.c, gts/refine.c, gts/rounding.h, + gts/segment.c, gts/split.c, gts/stripe.c, gts/surface.c, + gts/triangle.c, gts/tribox3.c, gts/vertex.c, gts/vopt.c, + src/Makefile.am, src/gts/.gitignore, src/gts/NOTES, + src/gts/bbtree.c, src/gts/boolean.c, src/gts/cdt.c, + src/gts/container.c, src/gts/curvature.c, src/gts/edge.c, + src/gts/eheap.c, src/gts/face.c, src/gts/fifo.c, src/gts/graph.c, + src/gts/gts-private.h, src/gts/gts.h, src/gts/heap.c, + src/gts/hsurface.c, src/gts/iso.c, src/gts/isotetra.c, + src/gts/kdtree.c, src/gts/matrix.c, src/gts/misc.c, + src/gts/named.c, src/gts/object.c, src/gts/oocs.c, + src/gts/partition.c, src/gts/pgraph.c, src/gts/point.c, + src/gts/predicates.c, src/gts/predicates.h, src/gts/psurface.c, + src/gts/refine.c, src/gts/rounding.h, src/gts/segment.c, + src/gts/split.c, src/gts/stripe.c, src/gts/surface.c, + src/gts/triangle.c, src/gts/tribox3.c, src/gts/vertex.c, + src/gts/vopt.c: Add top-level build changes to enable C++ + compilation This patch moves GTS (gts.sourceforce.net) out of the src/ tree and + gives it its own Makefile, and changes src/Makefile.am so that C++ + compilation is used if configure requests it. ./configure --enable-build-with-cxx ./configure + --disable-build-with-cxx (the default is disable at the moment) Makefiles with these lines will use C++ if the user requests it: CC = @CC_OR_CXX@ CFLAGS = @CC_OR_CXX_FLAGS@ + +2011-01-07 DJ Delorie * dj AT delorie dot com * + + * src/buffer.c: Support far-side polygons when converting buffer to + element. + +2011-01-07 DJ Delorie * dj AT delorie dot com * + + * src/action.c: Fix command-injection bug in Import() Use "--" before the list of schematics, to prevent the src list from + containing other gnetlist options (or arbitrary guile code) + +2011-01-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Fix prelight state for + layer button to show current status One of the ways we identify whether a layer is switched on or off is + by changing the background colour of the GtkToggleButton + representing that layer. Fix the prelight (mouse-over) background style to match the current + button state, so as to give immediate feed-back when the user + presses the button, and make the interface less confusing. Closes-bug: lp-699150 + +2010-12-28 Felix Ruoff * Felix AT posaunenmission dot de * + + * src/hid/gtk/gui-command-window.c, src/hid/gtk/gui-dialog-size.c, + src/hid/gtk/gui-misc.c, src/hid/gtk/gui-output-events.c, + src/hid/gtk/gui-top-window.c: hid/gtk: Modify window title to match + the GNOME Human Interface Guidelines Modifies the title of the main window as suggested in the GNOME HIG: + + (http://library.gnome.org/devel/hig-book/nightly/windows-primary.html)The following will be shown there: - A star (*) if the layout has unsaved changes (this patch also removes this sign from the statusbar, where it currently is) - The name of the layout, if set in the config-dialog ('Put layout name on the window title bar') - The filename (in braces, if layout name is shown) - The string " - PCB" Closes-bug: lp-699509 Acked-by: Peter Clifton * pcjc2 AT cam dot ac + dot uk * (Also modified commit message) + +2011-01-05 DJ Delorie * dj AT delorie dot com * + + * src/select.c: Fix "select pads on hidden far side" If an SMT pad is on the far side of the board, and the far side + layer is not visible, do not select that pad. Exception: if that + pad is part of an element which *is* on the visible side, the pad is + selected as part of selecting the whole element. But, elements on + the far side (the common case) won't have their pads selected when + those pads aren't visible. + +2011-01-04 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/main.c: Allow zoom-out-past-board for Lesstif The lesstif GUI has been modified two ways: 1. You may zoom out "past" the board, making the board smaller than + the window. Note that the crosshair is still limited to the board's + extents. 2. You may pan the board so that edges need not be on the edge of + the window, such as centering an edge for inspection. Note that the smallest the board can be is 1/10th the window size. + While this is arbitrary, it's easily changed if needed, and avoids + problems with miniscule boards (and thus maxiscule coordinate + systems). The 'v' key still zooms the board to fit, but now centers the board + in the window rather than placing it at the upper left. + +2011-01-04 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/netlist.c: ResetConncetions -> ResetConnections Typo. + +2011-01-04 DJ Delorie * dj AT delorie dot com * + + * src/hid/lesstif/menu.c: Fix lesstif segfault in key handling. When a key handler calls an action, the key table might change + before the action returns (via nested key handlers), so save a + pointer to the table we're parsing to ensure it will be around when + we return. + +2011-01-04 DJ Delorie * dj AT delorie dot com * + + * lib/geda.inc: Add 80-pin headers. Add 80 pin DIP and Ribbon 0.1" header macros to the usual list. + +2010-12-28 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-netlist-window.c, + src/hid/gtk/gui.h: hid/gtk: Fix warping pointer to correct location + from netlist window We weren't updating the pointer location after having panned the + connection into the center of the screen. Also fixes the open-coded panning code to work for flipped views. + The patch is pretty horrible at best, but appears to fix the issue. Unfortunately the locical call to use (the "Center" action) cannot + be made through the generic action code as we need to specify the + location explicitly. We could perhaps export the Centre action + function, or refactor it as a wrapper around a helper function which + we would then export and call. I aim to eventually rework the GTK HID's coordinate transforms + (including flipped views), event handling, view panning and pointer + warping in order to give greater sepeatation between the renderer + agnostic parts of the HID and the renderer. This will be needed for + the 3D portions of the PCB+GL branch. It seems most sensible to start refactoring from a state where the + existing code at least functions correctly (even if it isn't + pretty), rather than work in fixes as I refactor. + +2010-12-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-main.c: hid/gtk: + Remove unused Vx2 and Vy2 functions from gtkhid-{main,gdk}.c + +2010-12-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-output-events.c: hid/gtk: Remove unused file scope + variables event_x and event_y + +2010-12-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Compute warp pointer offset + without reading current position This is closer to the way the old code which used the an + XWarpPointer call worked, and makes the two code-paths where we warp + the pointer consistent. Also, remove some unnecessary comments which + were more relevant to explain why we previously had too + implementations. + +2010-12-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-main.c: hid/gtk: Fix "Center" action in a + couple of ways We need to update the adjustments together otherwise the center + action will only work on one axis at a time. Fix typo for out-of bounds check which mixed width and height. + +2010-12-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * configure.ac, src/hid/gtk/gtkhid-main.c: hid/gtk: Clean up mouse + warping code now we require a later GTK version Remove the X11 specific implementation and remove some comments in + the GDK one which were more relevant to explain why we previously + had two implementations. + +2010-12-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-dialog.c: Cleanup conditional code now we require + a later GTK version + +2010-12-27 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * configure.ac: Bump required GTK version in configure.ac test to + 2.12 This is required, as we utilise some of the newer APIs. NB: GTK+ 2.12.0 was released in September 2007 + +2010-12-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui.h: hid/gtk: Remove unused DRAW_Z, VIEW_Z macros + +2010-12-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-output-events.c: hid/gtk: Don't avoid panning when + further X11 events are pending Since we are using motion hints, we should not get bogged down with + motion events, so we should probably just act upon them. + +2010-12-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-output-events.c, src/hid/gtk/gui-top-window.c, + src/hid/gtk/gui.h: hid/gtk: Use motion notify events to avoid too + rapid pointer events Not fixing a specific problem - just a backport from the GL branch. + +2010-12-25 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/find.c, src/find.h, src/hid/gtk/gui-netlist-window.c, + src/hid/lesstif/netlist.c, src/rats.c, src/select.c: Revert undo + changes relating to RatFindHook calls This reverts commit 1aac06b665330507ca42f380e38f32875a979cd9 and commit d3b508ca272b7d89aa27f552ab78943f9bed27f9. I made a mistake by assuming the undo data saved by the RatFindHook + (when looking up nets to select) was redundant. I had presumed this + since the flags being set are reset again before we finish + processing. What actually happens, is that further processing sets the SELECTED + flag on the FOUND objects. Undo data is saved for the SELECTED flag + addition, which stores the previous flags of the object. When an + undo is performed, it also restores the FOUND flag we wanted to keep + unset. In order to get back to our original state, we need the RatFindHook + to store undo information for when the FOUND flag was initially set. The ResetConnections() call after the RatFindHook should still be ok + not saving undo information, as it only touches object flags which + will be restored anyway by the undo data now saved by the + RatFindHook. NB: Revert was manually modified to retain an indenting change in + find.c and to add the required changes to select.c, which had + additions using the RatFindHook API since the above reverted commits + were made. + +2010-12-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/find.c, src/report.c, src/set.c: Remove Draw() + call from ResetFound*() Let the caller do it This allows multiple changes to be grouped into one repaint + operation. Use this where appropriate, such as the Netlist lookup + functions. + +2010-12-23 Martin Kupec * martin dot kupec AT kupson dot cz * + + * src/action.c, src/const.h, src/select.c: Add NetByName to the + select action options v2: Check Net name appropriately v3: Ensure we set the changed flag Reviewed-by: Peter Clifton * pcjc2 AT cam dot ac dot uk * + +2010-12-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/find.c, src/find.h, src/hid/gtk/gui-netlist-window.c, + src/hid/lesstif/netlist.c, src/rats.c: find.c: Remove "undo" + parameter to RatFindHook Since all callers pass false for the "undo" parameter since the last + commit, remove it from the function prototype. NB: The file-global variable "User", which it previously set can be + assumed to be false, as it defaults to false - and is restored after + any code which temporarily sets it to true. + +2010-12-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-netlist-window.c, src/hid/lesstif/netlist.c: We + don't need the RatFindHook to save undo state when doing netlist + lookup We already save undo information to get to a known state when + resetting the FOUND flags. Since we later reset back to this state, + we don't need to save undo data. + +2010-12-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-netlist-window.c, src/hid/lesstif/netlist.c: Fix + netlist selection to save undo information for wiped "FOUND" flags When we wipe the found flags on objects, we should also queue them + for redraw - this fixes that too, as the ResetConnections() argument + controls both redraw AND saving undo data. + +2010-12-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gui-netlist-window.c, src/hid/lesstif/netlist.c: + Remove unneeded Undo serial number save / restore in netlist lookup The RatFindHook function does not call anything which will increment + the Undo serial number, so the save / restore calls are not + required. + +2010-12-24 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/autoroute.c, src/find.c, src/find.h, + src/hid/gtk/gui-netlist-window.c, src/hid/lesstif/netlist.c, + src/rats.c, src/report.c, src/set.c, src/toporouter.c: Fix broken + undo handling for ResetFound*() and ResetConnections() Many callers have this idiom: SaveUndoSerialNumber (); ResetFoundPinsViasAndPads (AndDraw); RestoreUndoSerialNumber (); ResetFoundLinesAndPolygons (AndDraw); The intent is to squash the two operations into one undo operation. + The ResetFound* functions DO increment the Undo serial number but + ONLY if that particular function makes a change. Assume for the example that the first ResetFound* call makes some + change and increments the serial number. This is then reset by the + caller. If the second ResetFound* call doesn't find anything, there + is no overall increment to the serial number. Move the undo serial number handling out of the ResetFound* calls, + and let the callers increment the serial number if desired. To + facilitate this, return a boolean value from these functions to + indicate whether any changes were made which could be undone. For convenience, expose previously static find.c function + ResetConnections() in order to avoid repeating Undo handling in each + caller to the two ResetFound* functions which are often called + together. + +2010-12-23 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/hid/gtk/gui-netlist-window.c, + src/hid/lesstif/netlist.c, src/select.c: select.c: Remove Draw() + call from SelectConnection Make callers responsible for calling the final Draw(), to avoid + multiple redraws if other operations are to occur, such as changing + "FOUND" flags on objects after making the selection. + +2010-12-23 Patrick Bernaud * patrickb AT chez dot com * + + * src/free_atexit.h: Fix substitutions for leaky_*alloc functions + +2010-12-22 Tibor Palinkas * geda AT igor2 dot repo dot hu * + + * src/hid/gtk/gui-top-window.c: hid/gtk: Use leaky_* functions for + deliberate leaks in ghid_ui_info_append Allocate cached temporary memory with the leak_* memory allocation + wrapers which allow these to be freed at exit. + +2010-12-22 Tibor Palinkas * geda AT igor2 dot repo dot hu * + + * src/free_atexit.c, src/free_atexit.h: free_atexit.c: Add + leaky_calloc() function for deliberately leaked calloc's Stores a pointer to the calloc'd memory to be free'd at exit of the + program. Returned memory must not be free'd manually. + +2010-12-22 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/report.c: report.c: Fix missing return value + +2010-12-22 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/toporouter.c: toporouter.c: Make inline functions "static + inline" gcc builds break for CFLAGS="-g" only builds (no -O2). Inlineing is + only performed when optimisation is enabled, and unless we make all + local inlined functions "static inline", it does not emit the + non-inlined assembly for them, resulting in undefined symbols at + link time. + +2010-12-22 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/gtk/gtkhid-gdk.c, src/hid/gtk/gtkhid-main.c, + src/hid/gtk/gui-output-events.c, src/hid/gtk/gui.h: hid/gtk: Move + more gdk specific drawing routines to gtkhid-gdk.c + +2010-12-22 Tibor Palinkas * geda AT igor2 dot repo dot hu * + + * src/Makefile.am, src/free_atexit.c, src/free_atexit.h, src/main.c: + Add leaky_{malloc,realloc} functions for deliberate non-free'd + allocations These are to be used for local allocations made and cached for the + lifetime of the program (never free'd). Typically, these are stored + in a static char * variable (or similar) within a function. The leaky_*() functions store the addresses of all memory they + allocate, and for debugging builds, free it upon exit of the + program, thus allowing leak detectors such as valgrind to ignore our + deliberate "leaks". The memory returned by leaky_*() must not be free'd. Build system and PCB integration, and leaky_atexit.c reindenting by + Peter Clifton * pcjc2 AT cam dot ac dot uk * + +2010-12-21 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/parse_l.l: parse_l.l: Fix warning implicit definition of + function ‘CreateBeLenient’ Warning was introduced in commit + e8dd18a2f7b83c6108d2c9398903d4be92e22d4c The required prototype was + added to create.h, but create.h was not included in parse_l.l Note to developers: Please "make clean" and build with "make -s" before pushing changes. + This kind of bug is really easy to catch, and I just recently spent + a log of effort cleaning up PCB's compile so we can catch real bugs! Pretty please? + +2010-12-20 Martin Kupec * martin dot kupec AT kupson dot cz * + + * src/action.c: action.c: Change macro ARG, to return NULL instead + of 0 When the argument number requested does not exist, return NULL, not + 0, as this is more in keeping with the type (char *) normally + returned. Commit message modified by Peter Clifton * pcjc2 AT cam dot ac dot + uk * + +2010-12-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * : commit 7392b020deca9ef155f3b1449f1ad8fac6d6083b Author: Peter + Clifton * pcjc2 AT cam dot ac dot uk * Date: Mon Dec 20 13:54:41 + 2010 +0000 + +2010-12-20 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/crosshair.c, src/search.c, src/search.h: Improve grid snapping + heuristics + +2010-12-19 DJ Delorie * dj AT delorie dot com * + + * src/create.c, src/create.h, src/parse_l.l: Allow via copper to + overlap; preserve illegal vias from file. Reduce "overlapping via" tests to check for overlapping drills, not + overlapping copper. If a file being loaded has "illegal" vias, load + them anyway - the check only happens at create time, if the user + figures out a way around it, preserve it. + +2010-12-16 DJ Delorie * dj AT delorie dot com * + + * src/rats.c: Further work on rats patch. Add a lot of comments to clarify what's happening in that function + (the previous patch was bogus because the function re-uses a + structure in an unintended way). Fixed the logic to be mew + paranoid. + +2010-12-16 DJ Delorie * dj AT delorie dot com * + + * src/rats.c: Fix rats bug (SF 3137324) When adding rats from a netlist, we want to skip nets with too few + connections, not netlists with too few nets. + +2009-02-20 Ineiev * ineiev AT users dot sourceforge dot net * + + * src/report.c: report object coordinates in selected units SF patch 1621915 HOW TO TEST load a pcb; Ctrl-R on objects of different types; the + reported units should be either mm or mils according to selected + units 04 Oct 2010: merged with Joerg Wunsch's patch 2995918 "Add + human-readable info to polygon report" + +2010-12-12 Ineiev * ineiev AT users dot berlios dot de * + + * src/polygon.c: [PATCH] fix bug 2793480 (vias/arcs-to-polygon + clearances) frac_circle(): introduce radius_adjustment factor to make the + polygon outline the arc rather than connet points on the arc ArcPolyNoIntersect(): compute number of segments so that polygon + diverges from the arc no more than 0.02 of required thickness; + adjust outer "arc" radius like in frac_circle() + +2010-12-11 DJ Delorie * dj AT delorie dot com * + + * src/file.c: Check for special name "(local)" to mean "." When expanding a tree of footprints, we want the symbolic name + "(local)" to mean the "." subdir. Now that we check for chdir() + failures, we can no longer "just work" because the chdir didn't + change directories. + +2010-12-11 David Dandar * ddandar AT users dot sourceforge dot net * + + * src/action.c: Let RealignGrid align grid to a pin or pad snap. SF patch 2476262: Realign grid has been broken for a while. Darn mm and mil mix + components were killing me. I got desperate and fixed it, but I'm + not sure if it's the right fix. It does work though. Hope this + helps. + +2010-12-11 Seb James * seb AT esfnet dot co dot uk * + + * src/rats.c: SF patch 1674895: This crash occurs in rats.c, around line 610 in the function + DrawShortestRats() where CreateNewRat() is called with some + arguments which don't exist. It occurred for me when I tried to "optimize rats nest" on an + invalid design. There's no check in DrawShortestRats() that the firstposition and + secondposition pointers are not NULL. firstposition->X (and Y) and + secondposition->X (and Y) are passed as arguments to CreateNewRat(). + It is possible in some cases that firstposition and secondposition + are not reset from 0 in the code preceding the call to + CreateNewRat(). In these cases a segfault will occur. + +2010-10-09 Cesar Strauss * cstrauss AT not2005 dot cea dot inpe dot br * + + * configure.ac, src/action.c: Check for the _spawnvp function and + use it if present. + +2010-10-09 Cesar Strauss * cstrauss AT not2005 dot cea dot inpe dot br * + + * src/.gitignore: Ignore generated files on Windows. + +2010-12-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/buffer.c, src/command.c, src/create.c, + src/drill.c, src/file.c, src/find.c, src/hid/common/flags.c, + src/hid/gerber/gerber.c, src/hid/gtk/gtkhid-gdk.c, + src/hid/gtk/gui-dialog-size.c, src/hid/gtk/gui-top-window.c, + src/hid/lesstif/main.c, src/hid/lesstif/menu.c, + src/hid/lesstif/styles.c, src/intersect.c, src/main.c, src/misc.c, + src/mymem.c, src/mymem.h, src/netlist.c, src/parse_l.l, + src/parse_y.y, src/rats.c, src/remove.c, src/report.c, src/undo.c: + Remove My* memory allocation routines. Just use the standard APIs + directly This means the following changes: 1. Replace all calls to MyCalloc() with calls to calloc() 2. Replace all calls to MyMalloc() with calls to malloc() 3. Replace all calls to MyRealloc() with calls to realloc() 4. Replace all calls to SaveFree() with calls to free() 5a. Where the MYFREE(x) macro is used and its pointer clearing + side- effect is required, call free (x); and (x) = NULL; directly. 5b. Where the MYFREE(x) macro is used, and (x) is immediately re- assigned, or its location free'd or zero'd, skip the (x) = + NULL; 6. Replace all calls to MyStrdup() with calls to the STRDUP(x) + macro, which expands to (((x) != NULL) ? strdup (x) : NULL). NB: The previous commit already replaced various known "safe" calls + of MyStrdup() with strdup(), when the argument is known to be + non-NULL. 1,2,3 and 6. mean that we discard the following features of the mymem.c allocators: 7. Logging messages when MEM_DEBUF defined 8. Logic to assign 1 unit of memory if 0 is requested 9. Allocation failure handling via MyFatal() -> EmergencySave() With feedback from Stephen Ecob * silicon dot on dot inspiration AT + gmail dot com * 7. Is old debug code which is rarely (if ever) used. Current debug + tools such as Valgrind can do a much better job of memory debugging + now. 8. This is really papering over the possibility of a caller bug, and should never have been included in the first place. 9. This is unlikely to actually ever save someone from loosing their + PCB. Patch created with the assistance and testing of Stephen Ecob * + silicon dot on dot inspiration AT gmail dot com * + +2010-12-07 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/buffer.c, src/copy.c, src/create.c, src/file.c, + src/fontmode.c, src/main.c, src/misc.c, src/move.c, src/netlist.c, + src/rats.c: Convet some "safe" usage of MyStrdup to plain strdup These cases are ones where we know the caller will not risk passing + a NULL string to duplicate. Patch created with the assistance and testing of Stephen Ecob * + silicon dot on dot inspiration AT gmail dot com * + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/create.c: Ensure CreateNewText() returns NULL if called with + NULL text. Ensuring that text will not be NULL allows us to replace the + MyStrdup call with a simple strdup. + +2010-12-10 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/file.c: file.c: c Attempt to handle failure of + GetWorkingDirectory() and chdir() Report the error to the user if any GetWorkingDirectory or chdir + call fails. Add attempts to change back to the original working + directory on error paths. Ideally, these functions would be re-implemented to operate without + changing the current working directory at all. + +2010-12-10 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c, src/change.c: Plug some memory leaks of strings + returned from gui->prompt_for() + +2010-12-10 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/vendor.c: vendor.c: Fix memory leak and unused variable in + ActionLoadVendorFrom() Also, don't bother testing x != NULL before calling free (x). + +2010-12-10 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/common/hidnogui.c: hid/common: Fix / re-write + nogui_{prompt_for,fileselect,confirm_dialog}() Fixes some pretty nasty bugs in these functions: 1. These functions must return allocated memory, strdup will do + nicely. 2. fgets will insert the newline character into the buffer, so we + need to check if we just got a '\r' or '\n' as our first character, + not just '\0' when deciding whether to return the default string or + not. 3. DO NOT strcpy a the default string... we don't know if it will overflow our buffer 4. For the "fileselect" case, return NULL if the user didn't give us + a filename, and the caller didn't specify a default string. Prompt + for will return strdup (""), equivalent to what it previously did. + +2010-12-10 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/batch/batch.c: hid/batch: Use hidnogui as a default base + hid to avoid code duplication + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Mark some strings as translateable in + ActionImport() + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/misc.c, src/misc.h, src/mymem.c, src/mymem.h: Make the strings + passed to AttributePutToList and MyStrdup (const char *) Silences some compiler warnings when using const char * strings. + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/lesstif/dialogs.c, src/hid/lesstif/main.c, + src/hid/lesstif/menu.c, src/hid/lesstif/netlist.c, + src/hid/lesstif/styles.c: hid/lesstif: Revert some Boolean->bool + type changes as required by Xt* APIs This is a partial revert of commit + ad5eb5a165442be38624aa622beeb57dc1d2afbd For consistency, I have also reverted the changes of True->true and + False->false when calling X11 APIs. + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/lesstif/dialogs.c: hid/lesstif: Use an intervening size_t + casts to aovid compiler warnings This is to avoid the compiler warning us what we already know.. that + we are passing an integer value cast into what might be a different + sized pointer. (On 64 bit builds). + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/batch/batch.c: hid/batch: Add some missing header files + for prototypes + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/Makefile.am, src/hid/batch/batch.c, src/hid/common/hidinit.h, + src/hid/gcode/gcode.c, src/hid/gerber/gerber.c, src/hid/lpr/lpr.c, + src/hid/nelma/nelma.c, src/hid/png/png.c, src/hid/ps/eps.c, + src/hid/ps/ps.c: hid/common: Provide a header to define + hid_parse_command_line() Avoids having each caller having to pull it in with an extern + declaration. + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/Makefile.am, src/hid/batch/batch.c, src/hid/common/actions.h, + src/main.c: hid/common: Provide a header file to define + print_actions() Avoids having each caller having to pull it in with an extern + declaration. + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid/batch/batch.c: Fix function prototypes and dummy return + values for batch HID Most of these are dummy functions, but we should get the prototypes + right! Also, return 0 from dummy functions which are supposed to + return an integer. Fixes various compiler warnings. + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/hid.h, src/hid/batch/batch.c, src/hid/common/hidnogui.c, + src/hid/gtk/gtkhid-main.c, src/hid/gtk/gui-dialog.c, + src/hid/gtk/gui.h, src/hid/lesstif/dialogs.c, + src/hid/lesstif/lesstif.h: HID: Make arguments to the prompt_for + method const char *, not char * Avoids compiler warnings calling gui->prompt_for() with a const char + * + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: Rename "r" variables used in calls to GetValue() to + be more descriptive A purely cosmetic change. + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: action.c: Fix data types in GetValue calls We passed an (int *) rather than a (bool *) in ActionImport() and + parse_layout_attribute_units() + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/misc.c, src/misc.h: Change unmodifed parameters to GetValue to + const char * Silences some compiler warnings in action.c + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/autoroute.c: autoroute.c: #if 0 out an unused static function + add_clearance() Silences compiler warning. + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/djopt.c: djopt.c: #if 0 out an unused static function + nudge_corner() Silences a compiler warning. + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/buffer.c: buffer.c: Declare variables before code in + ActionFreeRotateBuffer() Avoids compiler warning "ISO C90 forbids mixed declarations and + code" + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/change.c: change.c: Remove unused variable in + ChangeElementText() + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: Remove unused variables in ActionElementList() and + ActionImport() + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/action.c: Add missing return value in ActionImport() + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/rtree.c: Silence used function warning for __r_tree_is_good() + (Non-debug builds) __r_tree_is_good() and its helper functions are only used when + debugging, and are called from assert() macros. If "NDEBUG" is + defined, these expand to nothing, and the function is not called. Wrap __r_tree_is_good() and its helper, __r_tree_node_is_good() with + #ifndef NDEBUG + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/file.c: file.c: The "elapsed" variable in LoadPCB is debugging + only Silence compiler warning by moving it inside the #ifdef DEBUG + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/flags.c: flags.c: Avoid compiler warning when casting our + OffsetOf value Strictly, our OffsetOf calculation "could" return a number as large + as the pointer size on the system - so the compiler will complain + when we squash it directly into an int. Casting via a size_t will + avoid the warning. Our structure offsets are small, so this is safe - if somewhat ugly. + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/toporouter.c: Toporouter: Comment unused debug variable Silences compiler warning + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/gts/pgraph.c: gts: Comment some unused variables left as + placeholders Silences compiler warnings + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/gts/edge.c: gts: Add cast to silence compiler warning + +2010-12-09 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/parse_l.l, src/res_lex.l: *.l: Add #define YY_NO_INPUT to + avoid defining unused "input()" function Silences compiler warnings + +2010-12-09 Stephen Ecob * silicon dot on dot inspiration AT gmail dot com * + + * src/buffer.c: Fix SmashBufferElement(), broken by fixing a memory + leak in FreeDataMemory() Commit 466b0183758ef3ca44623c43de60a233b175d2ad broke + SmashBufferElement() by changing FreeDataMemory() (which + SmashBufferElement() calls via ClearBuffer()). SmashBufferElement() + depended on the memory leak of Data->Element in FreeDataMemory(). This patch removes the dependence on the leak. Commit-message-reformatted-by: Peter Clifton * pcjc2 AT cam dot ac + dot uk * + +2010-12-07 Stephen Ecob * silicon dot on dot inspiration AT gmail dot com * + + * src/misc.c, src/mymem.c: Fixed some memory leaks associated with + the global PCB structure. + +2010-11-28 DJ Delorie * dj AT delorie dot com * + + * src/djopt.c: Store is_pad flag for each line rather than trying to + deduce if a line is a pad or not. + +2010-11-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * : commit 093a606b182229c8e28118ace1be7d6b6ad5cf7f Author: Peter + Clifton * pcjc2 AT cam dot ac dot uk * Date: Fri Nov 26 03:26:08 + 2010 +0000 + +2010-11-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/polygon1.c: Various speedups to the polygon code. Attempt to fix polygon slowness by avoiding the need to create a + completely new polygon for each boolean operation. This mostly + relies upon r-tree searches to find contours to operate on - rather + than searching each in turn. We avoid labelling all of the "A" polygon's contours, use the + contour r-trees to dynamically search the required data. Added code to reparent holes which end up in the wrong polygon piece + after inserting a new hole in InsertHoles. This means we don't have + to dump every potental hole we encounter in the holes insersion + queue, hopefully leading to better dynamic update performance. At this point, polygon performance has finally seen a net gain. HOWEVER: Due to differences in the order of polygon operations, the data-structures resulting from a boolean polygon operation may be sorted differently. In certain contrived cases, where a polygon is clipped into identically sized pieces, the resulting piece of polygon which PCB will keep and use on the board is different after this commit. + +2010-11-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/polygon1.c: Use heap structure to insert holes quicker in + InsertHoles() + +2010-11-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/polyarea.h, src/polygon.c, src/polygon1.c: Optimise polygon + operations by keeping an rtree of POLYAREA contours Attempt to speed up the intersect() routine using this rtree rather + than generating a new one at each call. Due to the increased overheads of keeping an r-tree up to date, + there is a significant overall slow-down at this point in the patch + series. + +2010-11-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/polygon1.c: Use rtree of countours when computing an + intersection NOTE: This is more complex than the existing code, and on its own, actually slows things down a little. The intention is that the r-tree should be maintained + continually, so it doesn't need to be recreated with each call + to intersect(). + +2010-11-26 Peter Clifton * pcjc2 AT cam dot ac dot uk * + + * src/polygon.c: polygon.c: Accumulate vias and lines into batches + before subtracting them Accumulate polygons to clear from lines and pins in batches, then + clear from the polygon. Not quite sure why, but this _really_ seems + to speed up loading very complex boards. (e.g. 50sec -> 10sec for + one example). Possibly this is because withing the assembled batches, it is + cheaper to produce a more unified contour (touching lines), and the + complex contours of the main polygon are broken less frequently. It isn't quite clear why this helps so much for pins / vias (which + won't usually touch each-other), however it changes a 50sec load + time to 10 sec. This could perhaps be because any contours which + are smashed by clearance of closely spaced vias / pins now only + incurr the penalty of breaking the main contour once every batch + (100 vias / pins). Batch sizes (20 for lines, 100 for pins / vias) aren't necessarily + optimal! Also, clear pins and vias last... There is a chance these objects are simpler, and just end up as + holes in the main polygon, rather than causing a contour + intersection. This means it is cheaper to add them last. If we add them first, and make the polygon complex, objects (usually + lines) which pierce the polygon's outer contour cause all the holes + to be removed and queued for re-insersion after the new contour is + constructed. + +2010-11-07 DJ Delorie * dj AT delorie dot com * + + * lib/geda.inc: Add more ACY, ACPY, ALF, RCY, RCYP, JUMPER, and + HEADER macros to fill in the gaps. + +2010-11-07 DJ Delorie * dj AT delorie dot com * + + * src/toporouter.c: Comment out code to dump toporouter surfaces. + +2010-09-29 DJ Delorie * dj AT delorie dot com * + + * NEWS: Update NEWS from ChangeLog + +2010-09-29 DJ Delorie * dj AT delorie dot com * + + * ChangeLog: Update ChangeLog from git logs. + +2010-09-29 DJ Delorie * dj AT delorie dot com * + + * po/POTFILES.in: Fix for distcheck errors. + 2010-09-29 DJ Delorie * dj AT delorie dot com * * src/action.c: Make new text clear polygons diff -Nru pcb-20100929/config.h.in pcb-20110918/config.h.in --- pcb-20100929/config.h.in 2010-09-29 20:48:15.000000000 +0000 +++ pcb-20110918/config.h.in 2011-09-18 20:06:18.000000000 +0000 @@ -9,6 +9,12 @@ /* Relative path from bindir to pcbtreedir */ #undef BINDIR_TO_PCBTREEDIR +/* Maximum value of coordinate type */ +#undef COORD_MAX + +/* C type for Coordinates */ +#undef COORD_TYPE + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -17,6 +23,9 @@ /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA +/* Define to 1 if GL support is to be compiled in */ +#undef ENABLE_GL + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -37,35 +46,15 @@ */ #undef HAVE_ALLOCA_H -/* Define to 1 if you have the `argz_count' function. */ -#undef HAVE_ARGZ_COUNT - /* Define to 1 if you have the header file. */ #undef HAVE_ARGZ_H -/* Define to 1 if you have the `argz_next' function. */ -#undef HAVE_ARGZ_NEXT - -/* Define to 1 if you have the `argz_stringify' function. */ -#undef HAVE_ARGZ_STRINGIFY - /* Define to 1 if you have the `asprintf' function. */ #undef HAVE_ASPRINTF -/* Define to 1 if the compiler understands __builtin_expect. */ -#undef HAVE_BUILTIN_EXPECT - /* Define to 1 if you have the `canonicalize_file_name' function. */ #undef HAVE_CANONICALIZE_FILE_NAME -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -#undef HAVE_CFLOCALECOPYCURRENT - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -#undef HAVE_CFPREFERENCESCOPYAPPVALUE - /* Define to 1 if DBUS IPC is to be compiled in */ #undef HAVE_DBUS @@ -114,9 +103,6 @@ /* Define to 1 if you have the `gdImagePng' function. */ #undef HAVE_GDIMAGEPNG -/* Define to 1 if you have the header file. */ -#undef HAVE_GDK_GDKX_H - /* Define to 1 if you have the header file. */ #undef HAVE_GD_H @@ -132,9 +118,6 @@ /* Define to 1 if you have the `getgid' function. */ #undef HAVE_GETGID -/* Define to 1 if you have the `gethostname' function. */ -#undef HAVE_GETHOSTNAME - /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE @@ -147,13 +130,19 @@ /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID -/* Define if you have the iconv() function and it works. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_GL_GLU_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_GL_GL_H + +/* Define if you have the iconv() function. */ #undef HAVE_ICONV /* Define if you have the 'intmax_t' type in or . */ #undef HAVE_INTMAX_T -/* Define to 1 if you have the header file. */ +/* Define if exists and doesn't clash with . */ #undef HAVE_INTTYPES_H /* Define if exists, doesn't clash with , and @@ -223,8 +212,14 @@ /* Define to 1 if you have the `logf' function. */ #undef HAVE_LOGF -/* Define to 1 if the system has the type `long long int'. */ -#undef HAVE_LONG_LONG_INT +/* Define if you have the 'long double' type. */ +#undef HAVE_LONG_DOUBLE + +/* Define if you have the 'long long' type. */ +#undef HAVE_LONG_LONG + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -232,6 +227,9 @@ /* Define to 1 if you have the `mempcpy' function. */ #undef HAVE_MEMPCPY +/* Define to 1 if you have the `mkdir' function. */ +#undef HAVE_MKDIR + /* Define to 1 if you have the `mkdtemp' function. */ #undef HAVE_MKDTEMP @@ -247,9 +245,14 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_IN_H -/* Define if you have and it defines the NL_LOCALE_NAME macro if - _GNU_SOURCE is defined. */ -#undef HAVE_NL_LOCALE_NAME +/* Define to 1 if you have the header file. */ +#undef HAVE_NL_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENGL_GLU_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_OPENGL_GL_H /* Define to 1 if you have the `popen' function. */ #undef HAVE_POPEN @@ -257,11 +260,8 @@ /* Define if your printf() function supports format strings with positions. */ #undef HAVE_POSIX_PRINTF -/* Define if the defines PTHREAD_MUTEX_RECURSIVE. */ -#undef HAVE_PTHREAD_MUTEX_RECURSIVE - -/* Define if the POSIX multithreading library has read/write locks. */ -#undef HAVE_PTHREAD_RWLOCK +/* Define if you have POSIX threads libraries and header files. */ +#undef HAVE_PTHREAD /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV @@ -269,6 +269,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PWD_H +/* Define to 1 if you have the `rand' function. */ +#undef HAVE_RAND + /* Define to 1 if you have the `random' function. */ #undef HAVE_RANDOM @@ -360,12 +363,11 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if the system has the type `unsigned long long int'. */ -#undef HAVE_UNSIGNED_LONG_LONG_INT +/* Define if you have the 'unsigned long long' type. */ +#undef HAVE_UNSIGNED_LONG_LONG -/* Define to 1 or 0, depending whether the compiler supports simple visibility - declarations. */ -#undef HAVE_VISIBILITY +/* Use nonstandard varargs form for the GLU tesselator callback */ +#undef HAVE_VARARGS_GLU_TESSCB /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF @@ -382,12 +384,30 @@ /* Define if you have the 'wint_t' type. */ #undef HAVE_WINT_T +/* Define to 1 if Xinerama is available */ +#undef HAVE_XINERAMA + /* Define to 1 if you have the header file. */ #undef HAVE_XM_XM_H /* Define to 1 if Xrender is available */ #undef HAVE_XRENDER +/* Define to 1 if you have the `_mkdir' function. */ +#undef HAVE__MKDIR + +/* Define to 1 if you have the `_spawnvp' function. */ +#undef HAVE__SPAWNVP + +/* Define to 1 if you have the `__argz_count' function. */ +#undef HAVE___ARGZ_COUNT + +/* Define to 1 if you have the `__argz_next' function. */ +#undef HAVE___ARGZ_NEXT + +/* Define to 1 if you have the `__argz_stringify' function. */ +#undef HAVE___ARGZ_STRINGIFY + /* Define to 1 if you have the `__fsetlocking' function. */ #undef HAVE___FSETLOCKING @@ -403,6 +423,9 @@ /* m4 executible */ #undef M4 +/* Define if mkdir takes only one argument. */ +#undef MKDIR_TAKES_ONE_ARG + /* Define if canonicalize_file_name is not declared in system header files. */ #undef NEED_DECLARATION_CANONICALIZE_FILE_NAME @@ -424,6 +447,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -439,8 +465,9 @@ /* Define if exists and defines unusable PRI* macros. */ #undef PRI_MACROS_BROKEN -/* Define if the pthread_in_use() detection is hard. */ -#undef PTHREAD_IN_USE_DETECTION_HARD +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +#undef PTHREAD_CREATE_JOINABLE /* Define as the maximum value of type 'size_t', if the system doesn't define it. */ @@ -460,27 +487,6 @@ /* Define to 1 to enable toporouter graphical output */ #undef TOPO_OUTPUT_ENABLED -/* Define if the POSIX multithreading library can be used. */ -#undef USE_POSIX_THREADS - -/* Define if references to the POSIX multithreading library should be made - weak. */ -#undef USE_POSIX_THREADS_WEAK - -/* Define if the GNU Pth multithreading library can be used. */ -#undef USE_PTH_THREADS - -/* Define if references to the GNU Pth multithreading library should be made - weak. */ -#undef USE_PTH_THREADS_WEAK - -/* Define if the old Solaris multithreading library can be used. */ -#undef USE_SOLARIS_THREADS - -/* Define if references to the old Solaris multithreading library should be - made weak. */ -#undef USE_SOLARIS_THREADS_WEAK - /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE @@ -503,9 +509,6 @@ #endif -/* Define if the Win32 multithreading API can be used. */ -#undef USE_WIN32_THREADS - /* Version number of package */ #undef VERSION @@ -526,51 +529,28 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus #undef inline #endif +/* Define to `long int' if does not define. */ +#undef off_t + /* Define as the type of the result of subtracting two pointers, if the system doesn't define it. */ #undef ptrdiff_t +/* Define to empty if the C compiler doesn't support this keyword. */ +#undef signed + /* Define to `unsigned int' if does not define. */ #undef size_t /* Define to unsigned long or unsigned long long if and don't define. */ #undef uintmax_t - - -#define __libc_lock_t gl_lock_t -#define __libc_lock_define gl_lock_define -#define __libc_lock_define_initialized gl_lock_define_initialized -#define __libc_lock_init gl_lock_init -#define __libc_lock_lock gl_lock_lock -#define __libc_lock_unlock gl_lock_unlock -#define __libc_lock_recursive_t gl_recursive_lock_t -#define __libc_lock_define_recursive gl_recursive_lock_define -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -#define __libc_lock_init_recursive gl_recursive_lock_init -#define __libc_lock_lock_recursive gl_recursive_lock_lock -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -#define glthread_in_use libintl_thread_in_use -#define glthread_lock_init libintl_lock_init -#define glthread_lock_lock libintl_lock_lock -#define glthread_lock_unlock libintl_lock_unlock -#define glthread_lock_destroy libintl_lock_destroy -#define glthread_rwlock_init libintl_rwlock_init -#define glthread_rwlock_rdlock libintl_rwlock_rdlock -#define glthread_rwlock_wrlock libintl_rwlock_wrlock -#define glthread_rwlock_unlock libintl_rwlock_unlock -#define glthread_rwlock_destroy libintl_rwlock_destroy -#define glthread_recursive_lock_init libintl_recursive_lock_init -#define glthread_recursive_lock_lock libintl_recursive_lock_lock -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy -#define glthread_once libintl_once -#define glthread_once_call libintl_once_call -#define glthread_once_singlethreaded libintl_once_singlethreaded - diff -Nru pcb-20100929/configure pcb-20110918/configure --- pcb-20100929/configure 2010-09-29 20:48:20.000000000 +0000 +++ pcb-20110918/configure 2011-09-18 20:06:22.000000000 +0000 @@ -1,18 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for pcb 20100929. +# Generated by GNU Autoconf 2.66 for pcb 20110918. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -20,23 +24,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -44,7 +40,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -55,7 +57,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -78,13 +80,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -94,15 +89,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -114,12 +109,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -131,330 +130,299 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; 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\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 fi - - fi - fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append -exitcode=0 -if as_func_success; then - : +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' else - exitcode=1 - echo as_func_success failed. -fi + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi -if as_func_ret_success; then - : +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_ret_success failed. + as_expr=false fi -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -471,8 +439,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -482,29 +449,18 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -534,7 +490,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -553,10 +509,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -570,11 +526,11 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -589,14 +545,14 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='pcb' PACKAGE_TARNAME='pcb' -PACKAGE_VERSION='20100929' -PACKAGE_STRING='pcb 20100929' +PACKAGE_VERSION='20110918' +PACKAGE_STRING='pcb 20110918' PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="src/draw.c" # Factoring default headers for most tests. @@ -635,7 +591,7 @@ # include #endif" -gt_needs= +ac_header_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -647,6 +603,8 @@ LIBRARYFILENAME PCBLIBDIR FONTFILENAME +CC_OR_CXX_FLAGS +CC_OR_CXX DEBUG_BUILD_FALSE DEBUG_BUILD_TRUE PCB @@ -659,13 +617,14 @@ PNG_FALSE PNG_TRUE GDLIB_CONFIG +GTKGLEXT_LIBS +GTKGLEXT_CFLAGS GTK_LIBS GTK_CFLAGS X_EXTRA_LIBS X_LIBS X_PRE_LIBS X_CFLAGS -XMKMF GLIB_LIBS GLIB_CFLAGS HAVE_TEST_TOOLS_FALSE @@ -685,15 +644,9 @@ PS2PDF MISSING_TEXI2DVI_FALSE MISSING_TEXI2DVI_TRUE -MISSING_DVIPS_FALSE -MISSING_DVIPS_TRUE -DVIPS MISSING_PDFLATEX_FALSE MISSING_PDFLATEX_TRUE PDFLATEX -MISSING_LATEX_FALSE -MISSING_LATEX_TRUE -LATEX GNUM4 WISH M4 @@ -709,12 +662,26 @@ SETENV HIDLIBS HIDLIST +GLU_LIBS +GLU_CFLAGS +GL_LIBS +GL_CFLAGS +PTHREAD_CFLAGS +PTHREAD_LIBS +PTHREAD_CC +ax_pthread_config +SED +XMKMF +USE_GL_FALSE +USE_GL_TRUE DBUS_LIBS DBUS_CFLAGS WITH_DBUS_FALSE WITH_DBUS_TRUE CAIRO_LIBS CAIRO_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG WITH_TOPOROUTER_FALSE WITH_TOPOROUTER_TRUE @@ -768,43 +735,30 @@ CATOBJEXT USE_INCLUDED_LIBINTL BUILD_INCLUDED_LIBINTL -LTLIBC -WOE32 -WOE32DLL +INTLBISON +LTLIBICONV +LIBICONV HAVE_WPRINTF HAVE_SNPRINTF HAVE_ASPRINTF HAVE_POSIX_PRINTF -INTL_MACOSX_LIBS GLIBC21 -INTLBISON -LTLIBICONV -LIBICONV -LTLIBMULTITHREAD -LIBMULTITHREAD -LTLIBTHREAD -LIBTHREAD -LIBPTH_PREFIX -LTLIBPTH -LIBPTH -PRI_MACROS_BROKEN ALLOCA -HAVE_VISIBILITY -CFLAG_VISIBILITY RANLIB -GLIBC2 -XGETTEXT_EXTRA_OPTIONS MSGMERGE -XGETTEXT_015 XGETTEXT -GMSGFMT_015 -MSGFMT_015 GMSGFMT MSGFMT -GETTEXT_MACRO_VERSION USE_NLS +MKINSTALLDIRS GETTEXT_PACKAGE WINDRES +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +ac_ct_CXX +CXXFLAGS +CXX WIN32_FALSE WIN32_TRUE WIN32 @@ -898,6 +852,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -912,10 +867,8 @@ enable_doc enable_maintainer_mode enable_nls -enable_threads with_gnu_ld enable_rpath -with_libpth_prefix with_libiconv_prefix with_included_gettext with_libintl_prefix @@ -923,21 +876,26 @@ enable_toporouter enable_toporouter_output enable_dbus +enable_gl +with_x with_printer with_exporters with_xdgdatadir with_kdedatadir enable_update_desktop_database enable_update_mime_database -with_x enable_gif enable_jpeg enable_png enable_m4lib_png enable_xrender +enable_xinerama enable_dmalloc enable_efence enable_debug +enable_coord64 +enable_coord32 +enable_build_with_cxx ' ac_precious_vars='build_alias host_alias @@ -948,18 +906,25 @@ LIBS CPPFLAGS CPP +CXX +CXXFLAGS +CCC YACC YFLAGS PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR CAIRO_CFLAGS CAIRO_LIBS DBUS_CFLAGS DBUS_LIBS +XMKMF GLIB_CFLAGS GLIB_LIBS -XMKMF GTK_CFLAGS -GTK_LIBS' +GTK_LIBS +GTKGLEXT_CFLAGS +GTKGLEXT_LIBS' # Initialize some variables set by options. @@ -1068,8 +1033,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1095,8 +1059,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1300,8 +1263,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1317,8 +1279,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1348,17 +1309,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1375,15 +1336,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1406,8 +1365,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1421,8 +1379,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1437,11 +1395,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1480,13 +1436,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1512,7 +1466,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pcb 20100929 to adapt to many kinds of systems. +\`configure' configures pcb 20110918 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1526,7 +1480,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1586,7 +1540,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pcb 20100929:";; + short | recursive ) echo "Configuration of pcb 20110918:";; esac cat <<\_ACEOF @@ -1600,9 +1554,6 @@ --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --disable-nls do not use Native Language Support - --enable-threads={posix|solaris|pth|win32} - specify multithreading API - --disable-threads build without multithread safety --disable-rpath do not hardcode runtime library paths --enable-toporouter build toporouter [default=yes] @@ -1610,6 +1561,7 @@ enable toporouter graphical output [default=no] --enable-dbus Enable DBUS IPC + --enable-gl Enable GL drawing (with GTK HID) --disable-update-desktop-database do not update desktop database after installation --disable-update-mime-database @@ -1619,29 +1571,31 @@ --disable-png Disable support for PNG output when the png HID is used [default=include PNG support] --enable-m4lib-png Enable creating png previews for the m4 library --disable-xrender Compile and link with Xrender default=yes + --disable-xinerama Compile and link with Xinerama default=yes --enable-dmalloc Compile and link with dmalloc for malloc debugging default=no --enable-efence Link with ElectricFence for malloc debugging default=no --enable-debug Enable debugging code + --enable-coord64 Force 64-bit coordinate types + --enable-coord32 Force 32-bit coordinate types + --enable-build-with-cxx build with C++ compiler instead of C compiler Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib - --without-libpth-prefix don't search for libpth in includedir and libdir --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-included-gettext use the GNU gettext library included here --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir --with-gui= Specify the GUI to use: batch gtk lesstif [default=gtk] + --with-x use the X Window System --with-printer= Specify the printer: lpr [default=lpr] --with-exporters= Enable export devices: bom gerber gcode nelma png ps [default=bom gerber gcode nelma png ps] --with-xdgdatadir=path Change where the theme icons and mime registrations are installed [DATADIR] --with-kdedatadir=path Change where the KDE mime reg istrations are installed [DATADIR] - --with-x use the X Window System Some influential environment variables: CC C compiler command @@ -1649,29 +1603,40 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags YACC The `Yet Another C Compiler' implementation to use. Defaults to the first program found out of: `bison -y', `byacc', `yacc'. YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path CAIRO_CFLAGS C compiler flags for CAIRO, overriding pkg-config CAIRO_LIBS linker flags for CAIRO, overriding pkg-config DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config DBUS_LIBS linker flags for DBUS, overriding pkg-config + XMKMF Path to xmkmf, Makefile generator for X Window System GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config - XMKMF Path to xmkmf, Makefile generator for X Window System GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config + GTKGLEXT_CFLAGS + C compiler flags for GTKGLEXT, overriding pkg-config + GTKGLEXT_LIBS + linker flags for GTKGLEXT, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1734,413 +1699,1014 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pcb configure 20100929 -generated by GNU Autoconf 2.63 +pcb configure 20110918 +generated by GNU Autoconf 2.66 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -It was created by pcb $as_me 20100929, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval - $ $0 $@ +} # ac_fn_c_try_compile -_ACEOF -exec 5>>config.log +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +} # ac_fn_c_try_cpp -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -_ASUNAME +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done -IFS=$as_save_IFS +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -} >&5 +} # ac_fn_c_check_header_mongrel -cat >&5 <<_ACEOF +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -## ----------- ## -## Core tests. ## -## ----------- ## +} # ac_fn_c_try_run +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_header_compile -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo +} # ac_fn_cxx_try_compile - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 +} # ac_fn_c_try_link -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : -# Predefined preprocessor variables. +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +} # ac_fn_c_check_type +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +#undef $2 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* 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_$2 || defined __stub___$2 +choke me +#endif -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" +int +main () +{ +return $2 (); + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_func -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ -gt_needs="$gt_needs " -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +It was created by pcb $as_me 20110918, which was +generated by GNU Autoconf 2.66. Invocation command line was + $ $0 $@ +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +_ASUNAME +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS +} >&5 +cat >&5 <<_ACEOF +## ----------- ## +## Core tests. ## +## ----------- ## +_ACEOF +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Predefined preprocessor variables. +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -am__api_version='1.11' +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +as_fn_append ac_header_list " stdlib.h" +as_fn_append ac_header_list " unistd.h" +as_fn_append ac_header_list " sys/param.h" +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + +am__api_version='1.11' + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2166,10 +2732,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2177,11 +2743,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2218,7 +2784,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2234,7 +2800,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2245,7 +2811,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 @@ -2256,15 +2822,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 -$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 -$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2286,11 +2848,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2299,13 +2858,10 @@ # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" @@ -2333,7 +2889,7 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi @@ -2354,9 +2910,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2367,24 +2923,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2394,9 +2950,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2407,24 +2963,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2433,7 +2989,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2446,10 +3002,10 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then + if test "${ac_cv_path_mkdir+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2457,7 +3013,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( @@ -2469,11 +3025,12 @@ esac done done -done + done IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2481,11 +3038,10 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" @@ -2498,9 +3054,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2511,24 +3067,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2536,11 +3092,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2548,7 +3104,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2558,11 +3114,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2582,9 +3138,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2600,7 +3154,7 @@ # Define the identity of the package. PACKAGE='pcb' - VERSION='20100929' + VERSION='20110918' cat >>confdefs.h <<_ACEOF @@ -2652,7 +3206,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= @@ -2680,12 +3234,12 @@ fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -2710,9 +3264,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2723,24 +3277,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2750,9 +3304,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2763,24 +3317,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2789,7 +3343,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2803,9 +3357,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2816,24 +3370,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2843,9 +3397,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2857,18 +3411,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2887,10 +3441,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2902,9 +3456,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2915,24 +3469,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2946,9 +3500,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2959,24 +3513,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2989,7 +3543,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -3000,57 +3554,37 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3066,8 +3600,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3083,17 +3617,17 @@ done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3110,7 +3644,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3129,84 +3663,41 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3221,32 +3712,83 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3258,17 +3800,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3281,31 +3823,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3319,37 +3853,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3358,20 +3871,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3382,35 +3891,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3421,36 +3906,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3461,42 +3922,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3513,18 +3949,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3581,32 +4013,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3617,17 +4026,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3637,9 +4048,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3747,7 +4158,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3768,14 +4179,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -3790,11 +4201,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3803,78 +4210,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -3886,7 +4249,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -3897,11 +4260,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3910,87 +4269,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -4000,9 +4312,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4013,7 +4325,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue @@ -4033,7 +4345,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -4048,26 +4360,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4081,7 +4391,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue @@ -4101,7 +4411,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -4116,12 +4426,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4129,21 +4437,17 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4158,48 +4462,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4209,18 +4488,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4230,14 +4505,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4264,118 +4535,33 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4386,134 +4572,8 @@ - if test "${ac_cv_header_minix_config_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5 -$as_echo_n "checking minix/config.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5 -$as_echo_n "checking minix/config.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_minix_config_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } - -fi -if test "x$ac_cv_header_minix_config_h" = x""yes; then + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +if test "x$ac_cv_header_minix_config_h" = x""yes; then : MINIX=yes else MINIX= @@ -4522,34 +4582,23 @@ if test "$MINIX" = yes; then -cat >>confdefs.h <<\_ACEOF -#define _POSIX_SOURCE 1 -_ACEOF +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define _POSIX_1_SOURCE 2 -_ACEOF +$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define _MINIX 1 -_ACEOF +$as_echo "#define _MINIX 1" >>confdefs.h fi - - { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then +if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # define __EXTENSIONS__ 1 @@ -4562,56 +4611,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_safe_to_define___extensions__=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_safe_to_define___extensions__=no + ac_cv_safe_to_define___extensions__=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } test $ac_cv_safe_to_define___extensions__ = yes && - cat >>confdefs.h <<\_ACEOF -#define __EXTENSIONS__ 1 -_ACEOF + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _ALL_SOURCE 1 -_ACEOF + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _POSIX_PTHREAD_SEMANTICS 1 -_ACEOF + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _TANDEM_SOURCE 1 -_ACEOF ac_config_headers="$ac_config_headers config.h" @@ -4628,16 +4647,16 @@ # this is that using maintainer mode proved to cause regular confusion. pcb_sources="tarball" -{ $as_echo "$as_me:$LINENO: checking if you are building from a git checkout" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if you are building from a git checkout" >&5 $as_echo_n "checking if you are building from a git checkout... " >&6; } pcb_git_version=no if test -f $srcdir/.gitignore ; then pcb_git_version=yes - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } pcb_sources="GIT" else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test x$pcb_git_version = xyes; then @@ -4649,16 +4668,16 @@ fi -{ $as_echo "$as_me:$LINENO: checking if you are building from a anoncvs checkout" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if you are building from a anoncvs checkout" >&5 $as_echo_n "checking if you are building from a anoncvs checkout... " >&6; } pcb_cvs_version=no if test -f $srcdir/CVS/Root ; then pcb_cvs_version=yes - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } pcb_sources="CVS" else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test x$pcb_cvs_version = xyes; then @@ -4685,19 +4704,19 @@ # docs_yesno=yes -{ $as_echo "$as_me:$LINENO: checking if the documentation should be built" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the documentation should be built" >&5 $as_echo_n "checking if the documentation should be built... " >&6; } # Check whether --enable-doc was given. -if test "${enable_doc+set}" = set; then +if test "${enable_doc+set}" = set; then : enableval=$enable_doc; if test "X$enable_doc" = "Xno" ; then DOC="" - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } docs_yesno=no else DOC=doc - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } docs_yesno=yes fi @@ -4705,7 +4724,7 @@ else DOC=doc -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } docs_yesno=yes @@ -4714,28 +4733,28 @@ -{ $as_echo "$as_me:$LINENO: checking if maintainer mode is required" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if maintainer mode is required" >&5 $as_echo_n "checking if maintainer mode is required... " >&6; } if test "$docs_yesno" = "yes" -a "$pcb_git_version" = "yes" ; then - { $as_echo "$as_me:$LINENO: result: yes -- the documentation build is enabled and your sources are from git" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes -- the documentation build is enabled and your sources are from git" >&5 $as_echo "yes -- the documentation build is enabled and your sources are from git" >&6; } enable_maintainer_mode=yes else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -4752,35 +4771,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if test "${ac_cv_build+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -4796,28 +4807,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if test "${ac_cv_host+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -4833,7 +4840,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking for windows" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for windows" >&5 $as_echo_n "checking for windows... " >&6; } PCB_PATH_DELIMETER=":" PCB_DIR_SEPARATOR_S="/" @@ -4855,7 +4862,7 @@ ;; esac -{ $as_echo "$as_me:$LINENO: result: $WIN32" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WIN32" >&5 $as_echo "$WIN32" >&6; } if test x$WIN32 = xyes; then @@ -4897,9 +4904,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4910,24 +4917,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4937,9 +4944,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4950,24 +4957,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4976,7 +4983,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4990,9 +4997,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5003,24 +5010,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5030,9 +5037,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5044,18 +5051,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -5074,10 +5081,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5089,9 +5096,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5102,24 +5109,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5133,9 +5140,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -5146,24 +5153,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5176,7 +5183,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5187,62 +5194,42 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5256,37 +5243,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -5295,20 +5261,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5319,35 +5281,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5358,36 +5296,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5398,42 +5312,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -5450,18 +5339,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -5518,32 +5403,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -5554,17 +5416,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5574,9 +5438,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -5684,7 +5548,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -5699,259 +5563,527 @@ fi - -if test "x$WIN32" = "xyes" ; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then +if test "${ac_cv_prog_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 -$as_echo "$WINDRES" >&6; } +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + test -n "$CXX" && break + done fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_WINDRES="windres" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -$as_echo "$ac_ct_WINDRES" >&6; } +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_WINDRES" = x; then - WINDRES="no" + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - WINDRES=$ac_ct_WINDRES + CXX=$ac_ct_CXX fi -else - WINDRES="$ac_cv_prog_WINDRES" fi - if test "$WINDRES" = "no" ; then - { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 -$as_echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} - { (exit 1); exit 1; }; } - fi + fi fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -# i18n -GETTEXT_PACKAGE=$PACKAGE +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ +#ifndef __GNUC__ + choke me +#endif -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" + ; + return 0; +} _ACEOF - - - - - - { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } - # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then - enableval=$enable_nls; USE_NLS=$enableval +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes else - USE_NLS=yes + ac_compiler_gnu=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } - +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +else + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - GETTEXT_MACRO_VERSION=0.17 +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" else - PATH_SEPARATOR=: + CXXFLAGS="-g" fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" else - ac_executable_p="test -f" + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi fi -rm -f conf$$.file +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else - case "$MSGFMT" in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + + +if test "x$WIN32" = "xyes" ; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. +set dummy ${ac_tool_prefix}windres; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then +if test "${ac_cv_prog_WINDRES+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_WINDRES="${ac_tool_prefix}windres" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done + done +IFS=$as_save_IFS + +fi +fi +WINDRES=$ac_cv_prog_WINDRES +if test -n "$WINDRES"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 +$as_echo "$WINDRES" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_WINDRES"; then + ac_ct_WINDRES=$WINDRES + # Extract the first word of "windres", so it can be a program name with args. +set dummy windres; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_WINDRES"; then + ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_WINDRES="windres" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done IFS=$as_save_IFS - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } +fi +ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES +if test -n "$ac_ct_WINDRES"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 +$as_echo "$ac_ct_WINDRES" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + if test "x$ac_ct_WINDRES" = x; then + WINDRES="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + WINDRES=$ac_ct_WINDRES + fi +else + WINDRES="$ac_cv_prog_WINDRES" +fi + + if test "$WINDRES" = "no" ; then + as_fn_error $? "*** Could not find an implementation of windres in your PATH." "$LINENO" 5 + fi +fi + +# i18n +GETTEXT_PACKAGE=$PACKAGE + +cat >>confdefs.h <<_ACEOF +#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" +_ACEOF + + + + + + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval +else + USE_NLS=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } - case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; - *) MSGFMT_015=$MSGFMT ;; - esac - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; - *) GMSGFMT_015=$GMSGFMT ;; - esac @@ -5983,16 +6115,127 @@ fi rm -f conf$$.file -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else - case "$XGETTEXT" in + case "$MSGFMT" in [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case "$XGETTEXT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; *) ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR @@ -6001,8 +6244,7 @@ test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 && + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" break 2 @@ -6017,21 +6259,15 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi rm -f messages.po - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; - *) XGETTEXT_015=$XGETTEXT ;; - esac - - # Prepare PATH_SEPARATOR. # The user is always right. @@ -6063,9 +6299,9 @@ # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then +if test "${ac_cv_path_MSGMERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else case "$MSGMERGE" in @@ -6079,8 +6315,7 @@ test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then + if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" break 2 fi @@ -6094,67 +6329,47 @@ fi MSGMERGE="$ac_cv_path_MSGMERGE" if test "$MSGMERGE" != ":"; then - { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 $as_echo "$MSGMERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$localedir" || localedir='${datadir}/locale' - - - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= - - - ac_config_commands="$ac_config_commands po-directories" - - - - { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2 or newer" >&5 -$as_echo_n "checking whether we are using the GNU C Library 2 or newer... " >&6; } -if test "${ac_cv_gnu_library_2+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) - Lucky GNU user - #endif -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1; then - ac_cv_gnu_library_2=yes -else - ac_cv_gnu_library_2=no -fi -rm -f conftest* - - + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 +$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; } + GMSGFMT=":" + fi + fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2" >&5 -$as_echo "$ac_cv_gnu_library_2" >&6; } + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi + rm -f messages.po + fi - GLIBC2="$ac_cv_gnu_library_2" + ac_config_commands="$ac_config_commands default-1" 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then +if test "${ac_cv_prog_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -6165,24 +6380,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 $as_echo "$RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6192,9 +6407,9 @@ 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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -6205,24 +6420,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 $as_echo "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6231,7 +6446,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6242,93 +6457,168 @@ fi - - CFLAG_VISIBILITY= - HAVE_VISIBILITY=0 - if test -n "$GCC"; then - { $as_echo "$as_me:$LINENO: checking for simple visibility declarations" >&5 -$as_echo_n "checking for simple visibility declarations... " >&6; } - if test "${gl_cv_cc_visibility+set}" = set; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5 +$as_echo_n "checking for strerror in -lcposix... " >&6; } +if test "${ac_cv_lib_cposix_strerror+set}" = set; then : $as_echo_n "(cached) " >&6 else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcposix $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fvisibility=hidden" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char strerror (); +int +main () +{ +return strerror (); + ; + return 0; +} _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cposix_strerror=yes +else + ac_cv_lib_cposix_strerror=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5 +$as_echo "$ac_cv_lib_cposix_strerror" >&6; } +if test "x$ac_cv_lib_cposix_strerror" = x""yes; then : + LIBS="$LIBS -lcposix" +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -extern __attribute__((__visibility__("hidden"))) int hiddenvar; - extern __attribute__((__visibility__("default"))) int exportedvar; - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void); + int main () { +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset cs; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gl_cv_cc_visibility=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gl_cv_cc_visibility=no + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$gl_save_CFLAGS" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then - { $as_echo "$as_me:$LINENO: result: $gl_cv_cc_visibility" >&5 -$as_echo "$gl_cv_cc_visibility" >&6; } - if test $gl_cv_cc_visibility = yes; then - CFLAG_VISIBILITY="-fvisibility=hidden" - HAVE_VISIBILITY=1 - fi - fi +$as_echo "#define const /**/" >>confdefs.h +fi -cat >>confdefs.h <<_ACEOF -#define HAVE_VISIBILITY $HAVE_VISIBILITY + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed" >&5 +$as_echo_n "checking for signed... " >&6; } +if test "${bh_cv_c_signed+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +signed char x; + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + bh_cv_c_signed=yes +else + bh_cv_c_signed=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bh_cv_c_signed" >&5 +$as_echo "$bh_cv_c_signed" >&6; } + if test $bh_cv_c_signed = no; then +$as_echo "#define signed /**/" >>confdefs.h + + fi -{ $as_echo "$as_me:$LINENO: checking for inline" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then +if test "${ac_cv_c_inline+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; @@ -6337,41 +6627,17 @@ #endif _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_inline=$ac_kw -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 $as_echo "$ac_cv_c_inline" >&6; } - case $ac_cv_c_inline in inline | yes) ;; *) @@ -6387,163 +6653,232 @@ ;; esac -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 -$as_echo_n "checking for size_t... " >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - $as_echo_n "(cached) " >&6 +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = x""yes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define off_t long int +_ACEOF + +fi + +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : + else - ac_cv_type_size_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long" >&5 +$as_echo_n "checking for long long... " >&6; } +if test "${ac_cv_type_long_long+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default +long long ll = 1LL; int i = 63; int main () { -if (sizeof (size_t)) - return 0; +long long llmax = (long long) -1; + return ll << i | ll >> i | llmax / ll | llmax % ll; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof ((size_t))) - return 0; +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_type_long_long=yes +else + ac_cv_type_long_long=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long" >&5 +$as_echo "$ac_cv_type_long_long" >&6; } + if test $ac_cv_type_long_long = yes; then + +$as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double" >&5 +$as_echo_n "checking for long double... " >&6; } +if test "${gt_cv_c_long_double+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$GCC" = yes; then + gt_cv_c_long_double=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* The Stardent Vistra knows sizeof(long double), but does not support it. */ + long double foo = 0.0; + /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + int array [2*(sizeof(long double) >= sizeof(double)) - 1]; + +int +main () +{ + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : +if ac_fn_c_try_compile "$LINENO"; then : + gt_cv_c_long_double=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_size_t=yes + gt_cv_c_long_double=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_long_double" >&5 +$as_echo "$gt_cv_c_long_double" >&6; } + if test $gt_cv_c_long_double = yes; then + +$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5 +$as_echo_n "checking for wchar_t... " >&6; } +if test "${gt_cv_c_wchar_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + wchar_t foo = (wchar_t)'\0'; +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gt_cv_c_wchar_t=yes +else + gt_cv_c_wchar_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5 +$as_echo "$gt_cv_c_wchar_t" >&6; } + if test $gt_cv_c_wchar_t = yes; then + +$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 +$as_echo_n "checking for wint_t... " >&6; } +if test "${gt_cv_c_wint_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + wint_t foo = (wchar_t)'\0'; +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gt_cv_c_wint_t=yes +else + gt_cv_c_wint_t=no +fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -$as_echo "$ac_cv_type_size_t" >&6; } -if test "x$ac_cv_type_size_t" = x""yes; then - : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 +$as_echo "$gt_cv_c_wint_t" >&6; } + if test $gt_cv_c_wint_t = yes; then + +$as_echo "#define HAVE_WINT_T 1" >>confdefs.h + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5 +$as_echo_n "checking for inttypes.h... " >&6; } +if test "${jm_ac_cv_header_inttypes_h+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int +main () +{ +uintmax_t i = (uintmax_t) -1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + jm_ac_cv_header_inttypes_h=yes else + jm_ac_cv_header_inttypes_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $jm_ac_cv_header_inttypes_h" >&5 +$as_echo "$jm_ac_cv_header_inttypes_h" >&6; } + if test $jm_ac_cv_header_inttypes_h = yes; then cat >>confdefs.h <<_ACEOF -#define size_t unsigned int +#define HAVE_INTTYPES_H_WITH_UINTMAX 1 _ACEOF -fi + fi - { $as_echo "$as_me:$LINENO: checking for stdint.h" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5 $as_echo_n "checking for stdint.h... " >&6; } -if test "${gl_cv_header_stdint_h+set}" = set; then +if test "${jm_ac_cv_header_stdint_h+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int main () { -uintmax_t i = (uintmax_t) -1; return !i; +uintmax_t i = (uintmax_t) -1; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gl_cv_header_stdint_h=yes +if ac_fn_c_try_compile "$LINENO"; then : + jm_ac_cv_header_stdint_h=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gl_cv_header_stdint_h=no + jm_ac_cv_header_stdint_h=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5 -$as_echo "$gl_cv_header_stdint_h" >&6; } - if test $gl_cv_header_stdint_h = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $jm_ac_cv_header_stdint_h" >&5 +$as_echo "$jm_ac_cv_header_stdint_h" >&6; } + if test $jm_ac_cv_header_stdint_h = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_STDINT_H_WITH_UINTMAX 1 @@ -6551,18 +6886,121 @@ fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5 +$as_echo_n "checking for intmax_t... " >&6; } +if test "${gt_cv_c_intmax_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#if HAVE_STDINT_H_WITH_UINTMAX +#include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +#include +#endif + +int +main () +{ +intmax_t x = -1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gt_cv_c_intmax_t=yes +else + gt_cv_c_intmax_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5 +$as_echo "$gt_cv_c_intmax_t" >&6; } + if test $gt_cv_c_intmax_t = yes; then + +$as_echo "#define HAVE_INTMAX_T 1" >>confdefs.h + + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether printf() supports POSIX/XSI format strings" >&5 +$as_echo_n "checking whether printf() supports POSIX/XSI format strings... " >&6; } +if test "${gt_cv_func_printf_posix+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + if test "$cross_compiling" = yes; then : + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ + notposix +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "notposix" >/dev/null 2>&1; then : + gt_cv_func_printf_posix="guessing no" +else + gt_cv_func_printf_posix="guessing yes" +fi +rm -f conftest* + + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +/* The string "%2$d %1$d", with dollar characters protected from the shell's + dollar expansion (possibly an autoconf bug). */ +static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; +static char buf[100]; +int main () +{ + sprintf (buf, format, 33, 55); + return (strcmp (buf, "55 33") != 0); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gt_cv_func_printf_posix=yes +else + gt_cv_func_printf_posix=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_printf_posix" >&5 +$as_echo "$gt_cv_func_printf_posix" >&6; } + case $gt_cv_func_printf_posix in + *yes) + +$as_echo "#define HAVE_POSIX_PRINTF 1" >>confdefs.h + + ;; + esac + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 $as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then +if test "${ac_cv_working_alloca_h+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -6574,59 +7012,28 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_working_alloca_h=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_working_alloca_h=no + ac_cv_working_alloca_h=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 $as_echo "$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 +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -{ $as_echo "$as_me:$LINENO: checking for alloca" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 $as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then +if test "${ac_cv_func_alloca_works+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca @@ -6658,47 +7065,20 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_func_alloca_works=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_alloca_works=no + ac_cv_func_alloca_works=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 $as_echo "$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA 1 -_ACEOF +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h else # The SVR3 libPW and SVR4 libucb both contain incompatible functions @@ -6708,21 +7088,15 @@ ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -cat >>confdefs.h <<\_ACEOF -#define C_ALLOCA 1 -_ACEOF +$as_echo "#define C_ALLOCA 1" >>confdefs.h -{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then +if test "${ac_cv_os_cray+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined CRAY && ! defined CRAY2 webecray @@ -6732,7 +7106,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then + $EGREP "webecray" >/dev/null 2>&1; then : ac_cv_os_cray=yes else ac_cv_os_cray=no @@ -6740,125 +7114,33 @@ rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 $as_echo "$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + +cat >>confdefs.h <<_ACEOF +#define CRAY_STACKSEG_END $ac_func _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF - - break -fi + break +fi done fi -{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 $as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then +if test "${ac_cv_c_stack_direction+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_c_stack_direction=0 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -6881,46 +7163,18 @@ return find_stack_direction () < 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_c_stack_direction=1 else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_stack_direction=-1 + ac_cv_c_stack_direction=-1 fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 $as_echo "$ac_cv_c_stack_direction" >&6; } - cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction _ACEOF @@ -6930,143 +7184,13 @@ -for ac_header in stdlib.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in $ac_header_list +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7076,119 +7200,32 @@ done -for ac_func in getpagesize -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +for ac_func in getpagesize +do : + ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" +if test "x$ac_cv_func_getpagesize" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_GETPAGESIZE 1 _ACEOF fi done -{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 $as_echo_n "checking for working mmap... " >&6; } -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_mmap_fixed_mapped=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default /* malloc might have been renamed as rpl_malloc. */ @@ -7225,11 +7262,6 @@ /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE -/* Assume that all systems that can run configure have sys/param.h. */ -# ifndef HAVE_SYS_PARAM_H -# define HAVE_SYS_PARAM_H 1 -# endif - # ifdef _SC_PAGESIZE # define getpagesize() sysconf(_SC_PAGESIZE) # else /* no _SC_PAGESIZE */ @@ -7264,8 +7296,9 @@ main () { char *data, *data2, *data3; + const char *cdata2; int i, pagesize; - int fd; + int fd, fd2; pagesize = getpagesize (); @@ -7278,27 +7311,41 @@ umask (0); fd = creat ("conftest.mmap", 0600); if (fd < 0) - return 1; + return 2; if (write (fd, data, pagesize) != pagesize) - return 1; + return 3; close (fd); + /* Next, check that the tail of a page is zero-filled. File must have + non-zero length, otherwise we risk SIGBUS for entire page. */ + fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); + if (fd2 < 0) + return 4; + cdata2 = ""; + if (write (fd2, cdata2, 1) != 1) + return 5; + data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + if (data2 == MAP_FAILED) + return 6; + for (i = 0; i < pagesize; ++i) + if (*(data2 + i)) + return 7; + close (fd2); + if (munmap (data2, pagesize)) + return 8; + /* 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) - return 1; - data2 = (char *) malloc (2 * pagesize); - if (!data2) - return 1; - data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); + return 9; if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, fd, 0L)) - return 1; + return 10; for (i = 0; i < pagesize; ++i) if (*(data + i) != *(data2 + i)) - return 1; + return 11; /* 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 @@ -7307,108 +7354,100 @@ *(data2 + i) = *(data2 + i) + 1; data3 = (char *) malloc (pagesize); if (!data3) - return 1; + return 12; if (read (fd, data3, pagesize) != pagesize) - return 1; + return 13; for (i = 0; i < pagesize; ++i) if (*(data + i) != *(data3 + i)) - return 1; + return 14; close (fd); return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_mmap_fixed_mapped=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_mmap_fixed_mapped=no + ac_cv_func_mmap_fixed_mapped=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 $as_echo "$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 +$as_echo "#define HAVE_MMAP 1" >>confdefs.h + +fi +rm -f conftest.mmap conftest.txt + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5 +$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; } +if test "${ac_cv_gnu_library_2_1+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + _ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky GNU user" >/dev/null 2>&1; then : + ac_cv_gnu_library_2_1=yes +else + ac_cv_gnu_library_2_1=no +fi +rm -f conftest* + + fi -rm -f conftest.mmap +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5 +$as_echo "$ac_cv_gnu_library_2_1" >&6; } + + GLIBC21="$ac_cv_gnu_library_2_1" - { $as_echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether integer division by zero raises SIGFPE" >&5 $as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; } -if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then +if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then : $as_echo_n "(cached) " >&6 else - gt_cv_int_divbyzero_sigfpe= - case "$host_os" in - macos* | darwin[6-9]* | darwin[1-9][0-9]*) - # On MacOS X 10.2 or newer, just assume the same as when cross- - # compiling. If we were to perform the real test, 1 Crash Report - # dialog window would pop up. + if test "$cross_compiling" = yes; then : + + # Guess based on the CPU. case "$host_cpu" in - i[34567]86 | x86_64) - gt_cv_int_divbyzero_sigfpe="guessing yes" ;; + alpha* | i3456786 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; esac - ;; - esac - if test -z "$gt_cv_int_divbyzero_sigfpe"; then - if test "$cross_compiling" = yes; then - - # Guess based on the CPU. - case "$host_cpu" in - alpha* | i[34567]86 | x86_64 | m68k | s390*) - gt_cv_int_divbyzero_sigfpe="guessing yes";; - *) - gt_cv_int_divbyzero_sigfpe="guessing no";; - esac else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include static void +#ifdef __cplusplus sigfpe_handler (int sig) +#else +sigfpe_handler (sig) int sig; +#endif { /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ exit (sig != SIGFPE); @@ -7437,46 +7476,18 @@ } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : gt_cv_int_divbyzero_sigfpe=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -gt_cv_int_divbyzero_sigfpe=no + gt_cv_int_divbyzero_sigfpe=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi - fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_int_divbyzero_sigfpe" >&5 $as_echo "$gt_cv_int_divbyzero_sigfpe" >&6; } case "$gt_cv_int_divbyzero_sigfpe" in *yes) value=1;; @@ -7489,338 +7500,200 @@ - { $as_echo "$as_me:$LINENO: checking for inttypes.h" >&5 -$as_echo_n "checking for inttypes.h... " >&6; } -if test "${gl_cv_header_inttypes_h+set}" = set; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long" >&5 +$as_echo_n "checking for unsigned long long... " >&6; } +if test "${ac_cv_type_unsigned_long_long+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include +unsigned long long ull = 1ULL; int i = 63; int main () { -uintmax_t i = (uintmax_t) -1; return !i; +unsigned long long ullmax = (unsigned long long) -1; + return ull << i | ull >> i | ullmax / ull | ullmax % ull; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gl_cv_header_inttypes_h=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_type_unsigned_long_long=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gl_cv_header_inttypes_h=no + ac_cv_type_unsigned_long_long=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5 -$as_echo "$gl_cv_header_inttypes_h" >&6; } - if test $gl_cv_header_inttypes_h = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long" >&5 +$as_echo "$ac_cv_type_unsigned_long_long" >&6; } + if test $ac_cv_type_unsigned_long_long = yes; then + +$as_echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>confdefs.h + + fi + + + + + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then + + test $ac_cv_type_unsigned_long_long = yes \ + && ac_type='unsigned long long' \ + || ac_type='unsigned long' cat >>confdefs.h <<_ACEOF -#define HAVE_INTTYPES_H_WITH_UINTMAX 1 +#define uintmax_t $ac_type _ACEOF + else + +$as_echo "#define HAVE_UINTMAX_T 1" >>confdefs.h + fi - { $as_echo "$as_me:$LINENO: checking for unsigned long long int" >&5 -$as_echo_n "checking for unsigned long long int... " >&6; } -if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5 +$as_echo_n "checking for inttypes.h... " >&6; } +if test "${gt_cv_header_inttypes_h+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Test preprocessor. */ - #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - error in preprocessor; - #endif - #if ! (18446744073709551615ULL <= -1ull) - error in preprocessor; - #endif - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63; +#include +#include int main () { -/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); + ; return 0; } - _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_type_unsigned_long_long_int=yes +if ac_fn_c_try_compile "$LINENO"; then : + gt_cv_header_inttypes_h=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_unsigned_long_long_int=no + gt_cv_header_inttypes_h=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5 -$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } - if test $ac_cv_type_unsigned_long_long_int = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_header_inttypes_h" >&5 +$as_echo "$gt_cv_header_inttypes_h" >&6; } + if test $gt_cv_header_inttypes_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_UNSIGNED_LONG_LONG_INT 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_INTTYPES_H 1 _ACEOF fi + if test $gt_cv_header_inttypes_h = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5 +$as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; } +if test "${gt_cv_inttypes_pri_broken+set}" = set; then : + $as_echo_n "(cached) " >&6 +else - if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#ifdef PRId32 +char *p = PRId32; +#endif - test $ac_cv_type_unsigned_long_long_int = yes \ - && ac_type='unsigned long long' \ - || ac_type='unsigned long' +int +main () +{ -cat >>confdefs.h <<_ACEOF -#define uintmax_t $ac_type + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gt_cv_inttypes_pri_broken=no +else + gt_cv_inttypes_pri_broken=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_inttypes_pri_broken" >&5 +$as_echo "$gt_cv_inttypes_pri_broken" >&6; } + fi + if test "$gt_cv_inttypes_pri_broken" = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_UINTMAX_T 1 +cat >>confdefs.h <<_ACEOF +#define PRI_MACROS_BROKEN 1 _ACEOF fi - -for ac_header in inttypes.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> + for ac_header in stdint.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +done -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5 +$as_echo_n "checking for SIZE_MAX... " >&6; } + result= + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi +#include +#if HAVE_STDINT_H +#include +#endif +#ifdef SIZE_MAX +Found it +#endif -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Found it" >/dev/null 2>&1; then : + result=yes +fi +rm -f conftest* -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + if test -z "$result"; then + if ac_fn_c_compute_int "$LINENO" "~(size_t)0 / 10" "res_hi" "#include "; then : - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + result=? fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + if ac_fn_c_compute_int "$LINENO" "~(size_t)0 % 10" "res_lo" "#include "; then : + +else + result=? fi -done - if test $ac_cv_header_inttypes_h = yes; then - { $as_echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5 -$as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; } -if test "${gt_cv_inttypes_pri_broken+set}" = set; then - $as_echo_n "(cached) " >&6 + if ac_fn_c_compute_int "$LINENO" "sizeof (size_t) <= sizeof (unsigned int)" "fits_in_uint" "#include "; then : + else + result=? +fi - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + + if test "$fits_in_uint" = 1; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#ifdef PRId32 -char *p = PRId32; -#endif +#include + extern size_t foo; + extern unsigned long foo; int main () @@ -7830,88 +7703,44 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gt_cv_inttypes_pri_broken=no -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_inttypes_pri_broken=yes +if ac_fn_c_try_compile "$LINENO"; then : + fits_in_uint=0 fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5 -$as_echo "$gt_cv_inttypes_pri_broken" >&6; } + fi + if test -z "$result"; then + if test "$fits_in_uint" = 1; then + result="$res_hi$res_lo"U + else + result="$res_hi$res_lo"UL + fi + else + result='~(size_t)0' + fi fi - if test "$gt_cv_inttypes_pri_broken" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +$as_echo "$result" >&6; } + if test "$result" != yes; then cat >>confdefs.h <<_ACEOF -#define PRI_MACROS_BROKEN 1 +#define SIZE_MAX $result _ACEOF - PRI_MACROS_BROKEN=1 - else - PRI_MACROS_BROKEN=0 fi - - - - # Check whether --enable-threads was given. -if test "${enable_threads+set}" = set; then - enableval=$enable_threads; gl_use_threads=$enableval -else - case "$host_os" in - osf*) gl_use_threads=no ;; - *) gl_use_threads=yes ;; - esac + for ac_header in stdint.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H 1 +_ACEOF fi - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - # For using : - case "$host_os" in - osf*) - # On OSF/1, the compiler needs the flag -D_REENTRANT so that it - # groks . cc also understands the flag -pthread, but - # we don't use it because 1. gcc-2.95 doesn't understand -pthread, - # 2. putting a flag into CPPFLAGS that has an effect on the linker - # causes the AC_TRY_LINK test below to succeed unexpectedly, - # leading to wrong values of LIBTHREAD and LTLIBTHREAD. - CPPFLAGS="$CPPFLAGS -D_REENTRANT" - ;; - esac - # Some systems optimize for single-threaded programs by default, and - # need special flags to disable these optimizations. For example, the - # definition of 'errno' in . - case "$host_os" in - aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;; - solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;; - esac - fi - - +done @@ -7932,7 +7761,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -7954,7 +7783,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 $as_echo_n "checking for ld used by GCC... " >&6; } case $host in *-*-mingw*) @@ -7984,13 +7813,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${acl_cv_path_LD+set}" = set; then +if test "${acl_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -8018,18 +7847,16 @@ LD="$acl_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${acl_cv_prog_gnu_ld+set}" = set; then +if test "${acl_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. @@ -8040,16 +7867,15 @@ acl_cv_prog_gnu_ld=no ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 $as_echo "$acl_cv_prog_gnu_ld" >&6; } with_gnu_ld=$acl_cv_prog_gnu_ld - - { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 $as_echo_n "checking for shared library run path origin... " >&6; } -if test "${acl_cv_rpath+set}" = set; then +if test "${acl_cv_rpath+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -8060,19 +7886,17 @@ acl_cv_rpath=done fi -{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. -if test "${enable_rpath+set}" = set; then +if test "${enable_rpath+set}" = set; then : enableval=$enable_rpath; : else enable_rpath=yes @@ -8080,4798 +7904,426 @@ - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - gl_threads_api=none - LIBTHREAD= - LTLIBTHREAD= - LIBMULTITHREAD= - LTLIBMULTITHREAD= - if test "$gl_use_threads" != no; then - { $as_echo "$as_me:$LINENO: checking whether imported symbols can be declared weak" >&5 -$as_echo_n "checking whether imported symbols can be declared weak... " >&6; } - gl_have_weak=no - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -extern void xyzzy (); -#pragma weak xyzzy -int -main () -{ -xyzzy(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gl_have_weak=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi + use_additional=yes -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $gl_have_weak" >&5 -$as_echo "$gl_have_weak" >&6; } - if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then - # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that - # it groks . It's added above, in gl_LOCK_EARLY_BODY. - if test "${ac_cv_header_pthread_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for pthread.h" >&5 -$as_echo_n "checking for pthread.h... " >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -$as_echo "$ac_cv_header_pthread_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking pthread.h usability" >&5 -$as_echo_n "checking pthread.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking pthread.h presence" >&5 -$as_echo_n "checking pthread.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for pthread.h" >&5 -$as_echo_n "checking for pthread.h... " >&6; } -if test "${ac_cv_header_pthread_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_pthread_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -$as_echo "$ac_cv_header_pthread_h" >&6; } + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" -fi -if test "x$ac_cv_header_pthread_h" = x""yes; then - gl_have_pthread_h=yes -else - gl_have_pthread_h=no -fi + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" - if test "$gl_have_pthread_h" = yes; then - # Other possible tests: - # -lpthreads (FSU threads, PCthreads) - # -lgthreads - gl_have_pthread= - # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist - # in libc. IRIX 6.5 has the first one in both libc and libpthread, but - # the second one only in libpthread, and lock.c needs it. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -pthread_mutex_lock((pthread_mutex_t*)0); - pthread_mutexattr_init((pthread_mutexattr_t*)0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gl_have_pthread=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Check whether --with-libiconv-prefix was given. +if test "${with_libiconv_prefix+set}" = set; then : + withval=$with_libiconv_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then -fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) - if test -n "$gl_have_pthread"; then - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5 -$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } -if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_kill (); -int -main () -{ -return pthread_kill (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_pthread_pthread_kill=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" - ac_cv_lib_pthread_pthread_kill=no -fi + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5 -$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } -if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread - # On Solaris and HP-UX, most pthread functions exist also in libc. - # Therefore pthread_in_use() needs to actually try to create a - # thread: pthread_create from libc will fail, whereas - # pthread_create will actually create a thread. - case "$host_os" in - solaris* | hpux*) -cat >>confdefs.h <<\_ACEOF -#define PTHREAD_IN_USE_DETECTION_HARD 1 -_ACEOF + LIBICONV= + LTLIBICONV= + INCICONV= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='iconv ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBICONV; do - esac + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" -fi + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" = yes; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBICONV; do - else - # Some library is needed. Try libpthread and libc_r. - { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5 -$as_echo_n "checking for pthread_kill in -lpthread... " >&6; } -if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_kill (); -int -main () -{ -return pthread_kill (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_pthread_pthread_kill=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pthread_pthread_kill=no -fi + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCICONV; do -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5 -$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; } -if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then - gl_have_pthread=yes - LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread - LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread -fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" - if test -z "$gl_have_pthread"; then - # For FreeBSD 4. - { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lc_r" >&5 -$as_echo_n "checking for pthread_kill in -lc_r... " >&6; } -if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc_r $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBICONV; do -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_kill (); -int -main () -{ -return pthread_kill (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_c_r_pthread_kill=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" - ac_cv_lib_c_r_pthread_kill=no -fi + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBICONV; do -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_kill" >&5 -$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; } -if test "x$ac_cv_lib_c_r_pthread_kill" = x""yes; then - gl_have_pthread=yes - LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r - LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r -fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" + ;; + esac + done + fi + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" fi fi - if test -n "$gl_have_pthread"; then - gl_threads_api=posix - -cat >>confdefs.h <<\_ACEOF -#define USE_POSIX_THREADS 1 -_ACEOF - - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then - if test $gl_have_weak = yes; then + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" + done + fi -cat >>confdefs.h <<\_ACEOF -#define USE_POSIX_THREADS_WEAK 1 -_ACEOF - LIBTHREAD= - LTLIBTHREAD= - fi - fi - # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the - # pthread_rwlock_* functions. - { $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5 -$as_echo_n "checking for pthread_rwlock_t... " >&6; } -if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_pthread_rwlock_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -if (sizeof (pthread_rwlock_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -int -main () -{ -if (sizeof ((pthread_rwlock_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pthread_rwlock_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5 -$as_echo "$ac_cv_type_pthread_rwlock_t" >&6; } -if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_RWLOCK 1 -_ACEOF - -fi - - # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -#if __FreeBSD__ == 4 -error "No, in FreeBSD 4.0 recursive mutexes actually don't work." -#else -int x = (int)PTHREAD_MUTEX_RECURSIVE; -return !x; -#endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_MUTEX_RECURSIVE 1 -_ACEOF - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - fi - fi - if test -z "$gl_have_pthread"; then - if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then - gl_have_solaristhread= - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lthread" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -thr_self(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gl_have_solaristhread=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" - if test -n "$gl_have_solaristhread"; then - gl_threads_api=solaris - LIBTHREAD=-lthread - LTLIBTHREAD=-lthread - LIBMULTITHREAD="$LIBTHREAD" - LTLIBMULTITHREAD="$LTLIBTHREAD" - -cat >>confdefs.h <<\_ACEOF -#define USE_SOLARIS_THREADS 1 -_ACEOF - - if test $gl_have_weak = yes; then - -cat >>confdefs.h <<\_ACEOF -#define USE_SOLARIS_THREADS_WEAK 1 -_ACEOF - - LIBTHREAD= - LTLIBTHREAD= - fi - fi - fi - fi - if test "$gl_use_threads" = pth; then - gl_save_CPPFLAGS="$CPPFLAGS" - - - - - - { $as_echo "$as_me:$LINENO: checking how to link with libpth" >&5 -$as_echo_n "checking how to link with libpth... " >&6; } -if test "${ac_cv_libpth_libs+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - - - - - use_additional=yes - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - -# Check whether --with-libpth-prefix was given. -if test "${with_libpth_prefix+set}" = set; then - withval=$with_libpth_prefix; - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi - -fi - - LIBPTH= - LTLIBPTH= - INCPTH= - LIBPTH_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='pth ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBPTH="${LIBPTH}${LIBPTH:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBPTH; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so" - else - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - if test "$acl_hardcode_direct" = yes; then - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so" - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - haveit= - for x in $LDFLAGS $LIBPTH; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so" - else - LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBPTH="${LIBPTH}${LIBPTH:+ }$found_a" - else - LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir -l$name" - fi - fi - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBPTH_PREFIX="$basedir" - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INCPTH; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - INCPTH="${INCPTH}${INCPTH:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBPTH; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBPTH="${LIBPTH}${LIBPTH:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBPTH; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBPTH="${LIBPTH}${LIBPTH:+ }$dep" - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$dep" - ;; - esac - done - fi - else - LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name" - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBPTH="${LIBPTH}${LIBPTH:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBPTH="${LIBPTH}${LIBPTH:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-R$found_dir" - done - fi - - ac_cv_libpth_libs="$LIBPTH" - ac_cv_libpth_ltlibs="$LTLIBPTH" - ac_cv_libpth_cppflags="$INCPTH" - ac_cv_libpth_prefix="$LIBPTH_PREFIX" - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_libpth_libs" >&5 -$as_echo "$ac_cv_libpth_libs" >&6; } - LIBPTH="$ac_cv_libpth_libs" - LTLIBPTH="$ac_cv_libpth_ltlibs" - INCPTH="$ac_cv_libpth_cppflags" - LIBPTH_PREFIX="$ac_cv_libpth_prefix" - - for element in $INCPTH; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - - - - HAVE_LIBPTH=yes - - - - gl_have_pth= - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lpth" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -pth_self(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gl_have_pth=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gl_save_LIBS" - if test -n "$gl_have_pth"; then - gl_threads_api=pth - LIBTHREAD="$LIBPTH" - LTLIBTHREAD="$LTLIBPTH" - LIBMULTITHREAD="$LIBTHREAD" - LTLIBMULTITHREAD="$LTLIBTHREAD" - -cat >>confdefs.h <<\_ACEOF -#define USE_PTH_THREADS 1 -_ACEOF - - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then - if test $gl_have_weak = yes; then - -cat >>confdefs.h <<\_ACEOF -#define USE_PTH_THREADS_WEAK 1 -_ACEOF - - LIBTHREAD= - LTLIBTHREAD= - fi - fi - else - CPPFLAGS="$gl_save_CPPFLAGS" - fi - fi - if test -z "$gl_have_pthread"; then - if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then - if { case "$host_os" in - mingw*) true;; - *) false;; - esac - }; then - gl_threads_api=win32 - -cat >>confdefs.h <<\_ACEOF -#define USE_WIN32_THREADS 1 -_ACEOF - - fi - fi - fi - fi - { $as_echo "$as_me:$LINENO: checking for multithread API to use" >&5 -$as_echo_n "checking for multithread API to use... " >&6; } - { $as_echo "$as_me:$LINENO: result: $gl_threads_api" >&5 -$as_echo "$gl_threads_api" >&6; } - - - - - - - - - - - - - - - - - - - - - use_additional=yes - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - -# Check whether --with-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then - withval=$with_libiconv_prefix; - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi - -fi - - LIBICONV= - LTLIBICONV= - INCICONV= - LIBICONV_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='iconv ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - if test "$acl_hardcode_direct" = yes; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - haveit= - for x in $LDFLAGS $LIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" - fi - fi - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBICONV_PREFIX="$basedir" - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INCICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" - ;; - esac - done - fi - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" - done - fi - - - - - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; } -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BUILTIN_EXPECT 1 -_ACEOF - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - - - - - -for ac_header in argz.h inttypes.h limits.h unistd.h sys/param.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - - - - - - - - - - - -for ac_func in getcwd getegid geteuid getgid getuid mempcpy munmap \ - stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ - argz_next __fsetlocking -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - { $as_echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5 -$as_echo_n "checking whether feof_unlocked is declared... " >&6; } -if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ - -#ifndef feof_unlocked - char *p = (char *) feof_unlocked; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_feof_unlocked=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_feof_unlocked=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5 -$as_echo "$ac_cv_have_decl_feof_unlocked" >&6; } - if test $ac_cv_have_decl_feof_unlocked = yes; then - gt_value=1 - else - gt_value=0 - fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FEOF_UNLOCKED $gt_value -_ACEOF - - - - { $as_echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5 -$as_echo_n "checking whether fgets_unlocked is declared... " >&6; } -if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ - -#ifndef fgets_unlocked - char *p = (char *) fgets_unlocked; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_fgets_unlocked=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_fgets_unlocked=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5 -$as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; } - if test $ac_cv_have_decl_fgets_unlocked = yes; then - gt_value=1 - else - gt_value=0 - fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FGETS_UNLOCKED $gt_value -_ACEOF - - - - - - - - - am_save_CPPFLAGS="$CPPFLAGS" - - for element in $INCICONV; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - - { $as_echo "$as_me:$LINENO: checking for iconv" >&5 -$as_echo_n "checking for iconv... " >&6; } -if test "${am_cv_func_iconv+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - am_cv_func_iconv=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" - fi - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 -$as_echo "$am_cv_func_iconv" >&6; } - if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:$LINENO: checking for working iconv" >&5 -$as_echo_n "checking for working iconv... " >&6; } -if test "${am_cv_func_iconv_works+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - am_save_LIBS="$LIBS" - if test $am_cv_lib_iconv = yes; then - LIBS="$LIBS $LIBICONV" - fi - if test "$cross_compiling" = yes; then - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -int main () -{ - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ - { - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); - if (cd_utf8_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\342\202\254"; /* EURO SIGN */ - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - return 1; - } - } -#if 0 /* This bug could be worked around by the caller. */ - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; - char buf[50]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if ((int)res > 0) - return 1; - } - } -#endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_func_iconv_works=yes -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -am_cv_func_iconv_works=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - LIBS="$am_save_LIBS" - -fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5 -$as_echo "$am_cv_func_iconv_works" >&6; } - case "$am_cv_func_iconv_works" in - *no) am_func_iconv=no am_cv_lib_iconv=no ;; - *) am_func_iconv=yes ;; - esac - else - am_func_iconv=no am_cv_lib_iconv=no - fi - if test "$am_func_iconv" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ICONV 1 -_ACEOF - - fi - if test "$am_cv_lib_iconv" = yes; then - { $as_echo "$as_me:$LINENO: checking how to link with libiconv" >&5 -$as_echo_n "checking how to link with libiconv... " >&6; } - { $as_echo "$as_me:$LINENO: result: $LIBICONV" >&5 -$as_echo "$LIBICONV" >&6; } - else - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - - - - if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:$LINENO: checking for iconv declaration" >&5 -$as_echo_n "checking for iconv declaration... " >&6; } - if test "${am_cv_proto_iconv+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - am_cv_proto_iconv_arg1="" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_proto_iconv_arg1="const" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { $as_echo "$as_me:$LINENO: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 -$as_echo "${ac_t:- - }$am_cv_proto_iconv" >&6; } - -cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 -_ACEOF - - fi - - - { $as_echo "$as_me:$LINENO: checking for NL_LOCALE_NAME macro" >&5 -$as_echo_n "checking for NL_LOCALE_NAME macro... " >&6; } -if test "${gt_cv_nl_locale_name+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES)); - return !cs; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_nl_locale_name=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_nl_locale_name=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_nl_locale_name" >&5 -$as_echo "$gt_cv_nl_locale_name" >&6; } - if test $gt_cv_nl_locale_name = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_NL_LOCALE_NAME 1 -_ACEOF - - fi - - for ac_prog in bison -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_INTLBISON+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$INTLBISON"; then - ac_cv_prog_INTLBISON="$INTLBISON" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_INTLBISON="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -INTLBISON=$ac_cv_prog_INTLBISON -if test -n "$INTLBISON"; then - { $as_echo "$as_me:$LINENO: result: $INTLBISON" >&5 -$as_echo "$INTLBISON" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$INTLBISON" && break -done - - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - { $as_echo "$as_me:$LINENO: checking version of bison" >&5 -$as_echo_n "checking version of bison... " >&6; } - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 -$as_echo "$ac_prog_version" >&6; } - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi - - - { $as_echo "$as_me:$LINENO: checking for long long int" >&5 -$as_echo_n "checking for long long int... " >&6; } -if test "${ac_cv_type_long_long_int+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF - - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Test preprocessor. */ - #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - error in preprocessor; - #endif - #if ! (18446744073709551615ULL <= -1ull) - error in preprocessor; - #endif - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63; -int -main () -{ -/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); - ; - return 0; -} - -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if test "$cross_compiling" = yes; then - ac_cv_type_long_long_int=yes -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif -int -main () -{ -long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_long_long_int=yes -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_type_long_long_int=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_long_long_int=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 -$as_echo "$ac_cv_type_long_long_int" >&6; } - if test $ac_cv_type_long_long_int = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LONG_LONG_INT 1 -_ACEOF - - fi - - - { $as_echo "$as_me:$LINENO: checking for wchar_t" >&5 -$as_echo_n "checking for wchar_t... " >&6; } -if test "${gt_cv_c_wchar_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - wchar_t foo = (wchar_t)'\0'; -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gt_cv_c_wchar_t=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_c_wchar_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5 -$as_echo "$gt_cv_c_wchar_t" >&6; } - if test $gt_cv_c_wchar_t = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WCHAR_T 1 -_ACEOF - - fi - - - { $as_echo "$as_me:$LINENO: checking for wint_t" >&5 -$as_echo_n "checking for wint_t... " >&6; } -if test "${gt_cv_c_wint_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be included - before . */ -#include -#include -#include -#include - wint_t foo = (wchar_t)'\0'; -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gt_cv_c_wint_t=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_c_wint_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5 -$as_echo "$gt_cv_c_wint_t" >&6; } - if test $gt_cv_c_wint_t = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WINT_T 1 -_ACEOF - - fi - - - - - { $as_echo "$as_me:$LINENO: checking for intmax_t" >&5 -$as_echo_n "checking for intmax_t... " >&6; } -if test "${gt_cv_c_intmax_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -#if HAVE_STDINT_H_WITH_UINTMAX -#include -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -#include -#endif - -int -main () -{ -intmax_t x = -1; - return !x; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gt_cv_c_intmax_t=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_c_intmax_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5 -$as_echo "$gt_cv_c_intmax_t" >&6; } - if test $gt_cv_c_intmax_t = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_INTMAX_T 1 -_ACEOF - - fi - - - - { $as_echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5 -$as_echo_n "checking whether printf() supports POSIX/XSI format strings... " >&6; } -if test "${gt_cv_func_printf_posix+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - if test "$cross_compiling" = yes; then - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ - notposix -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "notposix" >/dev/null 2>&1; then - gt_cv_func_printf_posix="guessing no" -else - gt_cv_func_printf_posix="guessing yes" -fi -rm -f conftest* - - -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -/* The string "%2$d %1$d", with dollar characters protected from the shell's - dollar expansion (possibly an autoconf bug). */ -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; -static char buf[100]; -int main () -{ - sprintf (buf, format, 33, 55); - return (strcmp (buf, "55 33") != 0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gt_cv_func_printf_posix=yes -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -gt_cv_func_printf_posix=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5 -$as_echo "$gt_cv_func_printf_posix" >&6; } - case $gt_cv_func_printf_posix in - *yes) - -cat >>confdefs.h <<\_ACEOF -#define HAVE_POSIX_PRINTF 1 -_ACEOF - - ;; - esac - - - { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 -$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; } -if test "${ac_cv_gnu_library_2_1+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1; then - ac_cv_gnu_library_2_1=yes -else - ac_cv_gnu_library_2_1=no -fi -rm -f conftest* - - - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 -$as_echo "$ac_cv_gnu_library_2_1" >&6; } - - GLIBC21="$ac_cv_gnu_library_2_1" - - - - -for ac_header in stdint.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:$LINENO: checking for SIZE_MAX" >&5 -$as_echo_n "checking for SIZE_MAX... " >&6; } - if test "${gl_cv_size_max+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - gl_cv_size_max= - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#if HAVE_STDINT_H -#include -#endif -#ifdef SIZE_MAX -Found it -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Found it" >/dev/null 2>&1; then - gl_cv_size_max=yes -fi -rm -f conftest* - - if test -z "$gl_cv_size_max"; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) size_t_bits_minus_1=$ac_lo;; -'') size_t_bits_minus_1= ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -static long int longval () { return sizeof (size_t) * CHAR_BIT - 1; } -static unsigned long int ulongval () { return sizeof (size_t) * CHAR_BIT - 1; } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if ((sizeof (size_t) * CHAR_BIT - 1) < 0) - { - long int i = longval (); - if (i != (sizeof (size_t) * CHAR_BIT - 1)) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != (sizeof (size_t) * CHAR_BIT - 1)) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - size_t_bits_minus_1=`cat conftest.val` -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -size_t_bits_minus_1= -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) fits_in_uint=$ac_lo;; -'') fits_in_uint= ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); } -static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if ((sizeof (size_t) <= sizeof (unsigned int)) < 0) - { - long int i = longval (); - if (i != (sizeof (size_t) <= sizeof (unsigned int))) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != (sizeof (size_t) <= sizeof (unsigned int))) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - fits_in_uint=`cat conftest.val` -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -fits_in_uint= -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val - if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then - if test $fits_in_uint = 1; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - extern size_t foo; - extern unsigned long foo; - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - fits_in_uint=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $fits_in_uint = 1; then - gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" - else - gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" - fi - else - gl_cv_size_max='((size_t)~(size_t)0)' - fi - fi - -fi - - { $as_echo "$as_me:$LINENO: result: $gl_cv_size_max" >&5 -$as_echo "$gl_cv_size_max" >&6; } - if test "$gl_cv_size_max" != yes; then - -cat >>confdefs.h <<_ACEOF -#define SIZE_MAX $gl_cv_size_max -_ACEOF - - fi - - - - - -for ac_header in stdint.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - { $as_echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5 -$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } -if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then - $as_echo_n "(cached) " >&6 -else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -CFPreferencesCopyAppValue(NULL, NULL) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_func_CFPreferencesCopyAppValue=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_CFPreferencesCopyAppValue=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 -$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CFPREFERENCESCOPYAPPVALUE 1 -_ACEOF - - fi - { $as_echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5 -$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } -if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then - $as_echo_n "(cached) " >&6 -else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -CFLocaleCopyCurrent(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_func_CFLocaleCopyCurrent=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_CFLocaleCopyCurrent=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 -$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CFLOCALECOPYCURRENT 1 -_ACEOF - - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - - - - - - - - { $as_echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 -$as_echo_n "checking for ptrdiff_t... " >&6; } -if test "${ac_cv_type_ptrdiff_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_ptrdiff_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof (ptrdiff_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof ((ptrdiff_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_ptrdiff_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 -$as_echo "$ac_cv_type_ptrdiff_t" >&6; } -if test "x$ac_cv_type_ptrdiff_t" = x""yes; then - : -else - -cat >>confdefs.h <<\_ACEOF -#define ptrdiff_t long -_ACEOF - - -fi - - - - -for ac_header in stddef.h stdlib.h string.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - - -for ac_func in asprintf fwprintf putenv setenv setlocale snprintf wcslen -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" + + + + + + ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" +if test "x$ac_cv_type_ptrdiff_t" = x""yes; then : + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" +$as_echo "#define ptrdiff_t long" >>confdefs.h + + fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + +done + + for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \ +mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ +strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ +__fsetlocking +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -12881,16 +8333,12 @@ - { $as_echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snprintf is declared" >&5 $as_echo_n "checking whether _snprintf is declared... " >&6; } -if test "${ac_cv_have_decl__snprintf+set}" = set; then +if test "${ac_cv_have_decl__snprintf+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -12905,35 +8353,14 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_have_decl__snprintf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl__snprintf=no + ac_cv_have_decl__snprintf=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snprintf" >&5 $as_echo "$ac_cv_have_decl__snprintf" >&6; } if test $ac_cv_have_decl__snprintf = yes; then gt_value=1 @@ -12947,16 +8374,12 @@ - { $as_echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _snwprintf is declared" >&5 $as_echo_n "checking whether _snwprintf is declared... " >&6; } -if test "${ac_cv_have_decl__snwprintf+set}" = set; then +if test "${ac_cv_have_decl__snwprintf+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -12971,35 +8394,14 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_have_decl__snwprintf=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl__snwprintf=no + ac_cv_have_decl__snwprintf=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl__snwprintf" >&5 $as_echo "$ac_cv_have_decl__snwprintf" >&6; } if test $ac_cv_have_decl__snwprintf = yes; then gt_value=1 @@ -13014,16 +8416,94 @@ - { $as_echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5 -$as_echo_n "checking whether getc_unlocked is declared... " >&6; } -if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether feof_unlocked is declared" >&5 +$as_echo_n "checking whether feof_unlocked is declared... " >&6; } +if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ + +#ifndef feof_unlocked + char *p = (char *) feof_unlocked; +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_have_decl_feof_unlocked=yes +else + ac_cv_have_decl_feof_unlocked=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_feof_unlocked" >&5 +$as_echo "$ac_cv_have_decl_feof_unlocked" >&6; } + if test $ac_cv_have_decl_feof_unlocked = yes; then + gt_value=1 + else + gt_value=0 + fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FEOF_UNLOCKED $gt_value +_ACEOF + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fgets_unlocked is declared" >&5 +$as_echo_n "checking whether fgets_unlocked is declared... " >&6; } +if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ + +#ifndef fgets_unlocked + char *p = (char *) fgets_unlocked; +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_have_decl_fgets_unlocked=yes +else + ac_cv_have_decl_fgets_unlocked=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_fgets_unlocked" >&5 +$as_echo "$ac_cv_have_decl_fgets_unlocked" >&6; } + if test $ac_cv_have_decl_fgets_unlocked = yes; then + gt_value=1 + else + gt_value=0 + fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FGETS_UNLOCKED $gt_value _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getc_unlocked is declared" >&5 +$as_echo_n "checking whether getc_unlocked is declared... " >&6; } +if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -13038,35 +8518,14 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_have_decl_getc_unlocked=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_getc_unlocked=no + ac_cv_have_decl_getc_unlocked=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_decl_getc_unlocked" >&5 $as_echo "$ac_cv_have_decl_getc_unlocked" >&6; } if test $ac_cv_have_decl_getc_unlocked = yes; then gt_value=1 @@ -13105,81 +8564,202 @@ - { $as_echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 + + + + + am_save_CPPFLAGS="$CPPFLAGS" + + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if test "${am_cv_func_iconv+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_func_iconv=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_lib_iconv=yes + am_cv_func_iconv=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$am_save_LIBS" + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + +$as_echo "#define HAVE_ICONV 1" >>confdefs.h + + fi + if test "$am_cv_lib_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + + + + if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 +$as_echo_n "checking for iconv declaration... " >&6; } + if test "${am_cv_proto_iconv+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + am_cv_proto_iconv_arg1="" +else + am_cv_proto_iconv_arg1="const" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" +fi + + am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- + }$am_cv_proto_iconv" >&5 +$as_echo "${ac_t:- + }$am_cv_proto_iconv" >&6; } + +cat >>confdefs.h <<_ACEOF +#define ICONV_CONST $am_cv_proto_iconv_arg1 +_ACEOF + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; } -if test "${am_cv_langinfo_codeset+set}" = set; then +if test "${am_cv_langinfo_codeset+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int main () { -char* cs = nl_langinfo(CODESET); return !cs; +char* cs = nl_langinfo(CODESET); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_langinfo_codeset=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_langinfo_codeset=no + am_cv_langinfo_codeset=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 $as_echo "$am_cv_langinfo_codeset" >&6; } if test $am_cv_langinfo_codeset = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LANGINFO_CODESET 1 -_ACEOF +$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h fi + if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 $as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${gt_cv_val_LC_MESSAGES+set}" = set; then +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -13190,175 +8770,85 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_val_LC_MESSAGES=yes +if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_val_LC_MESSAGES=no + am_cv_val_LC_MESSAGES=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_val_LC_MESSAGES" >&5 -$as_echo "$gt_cv_val_LC_MESSAGES" >&6; } - if test $gt_cv_val_LC_MESSAGES = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$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 +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h fi - - if test "$enable_shared" = yes; then - case "$host_os" in - mingw* | cygwin*) is_woe32dll=yes ;; - *) is_woe32dll=no ;; - esac - else - is_woe32dll=no fi - WOE32DLL=$is_woe32dll - - - case "$host_os" in - mingw* | cygwin*) is_woe32=yes ;; - *) is_woe32=no ;; - esac - WOE32=$is_woe32 - if test $WOE32 = yes; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + for ac_prog in bison +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then +if test "${ac_cv_prog_INTLBISON+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. + if test -n "$INTLBISON"; then + ac_cv_prog_INTLBISON="$INTLBISON" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_INTLBISON="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 -$as_echo "$WINDRES" >&6; } +INTLBISON=$ac_cv_prog_INTLBISON +if test -n "$INTLBISON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLBISON" >&5 +$as_echo "$INTLBISON" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_WINDRES="windres" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + test -n "$INTLBISON" && break done -IFS=$as_save_IFS - -fi -fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -$as_echo "$ac_ct_WINDRES" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "x$ac_ct_WINDRES" = x; then - WINDRES="" + if test -z "$INTLBISON"; then + ac_verc_fail=yes else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - WINDRES=$ac_ct_WINDRES + { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of bison" >&5 +$as_echo_n "checking version of bison... " >&6; } + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 +$as_echo "$ac_prog_version" >&6; } fi -else - WINDRES="$ac_cv_prog_WINDRES" -fi - + if test $ac_verc_fail = yes; then + INTLBISON=: fi - case "$host_os" in - hpux*) LTLIBC="" ;; - *) LTLIBC="-lc" ;; - esac - - - - - - - - - @@ -13374,145 +8864,17 @@ - - - - { $as_echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5 -$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } -if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then - $as_echo_n "(cached) " >&6 -else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -CFPreferencesCopyAppValue(NULL, NULL) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_func_CFPreferencesCopyAppValue=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_CFPreferencesCopyAppValue=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 -$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CFPREFERENCESCOPYAPPVALUE 1 -_ACEOF - - fi - { $as_echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5 -$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } -if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then - $as_echo_n "(cached) " >&6 -else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -CFLocaleCopyCurrent(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_func_CFLocaleCopyCurrent=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_CFLocaleCopyCurrent=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" + USE_NLS=yes fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 -$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CFLOCALECOPYCURRENT 1 -_ACEOF - - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } @@ -13524,115 +8886,61 @@ LTLIBINTL= POSUB= - case " $gt_needs " in - *" need-formatstring-macros "*) gt_api_version=3 ;; - *" need-ngettext "*) gt_api_version=2 ;; - *) gt_api_version=1 ;; - esac - gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" - gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" - if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - { $as_echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included gettext is requested" >&5 $as_echo_n "checking whether included gettext is requested... " >&6; } # Check whether --with-included-gettext was given. -if test "${with_included_gettext+set}" = set; then +if test "${with_included_gettext+set}" = set; then : withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval else nls_cv_force_use_gnu_gettext=no fi - { $as_echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nls_cv_force_use_gnu_gettext" >&5 $as_echo "$nls_cv_force_use_gnu_gettext" >&6; } nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - if test $gt_api_version -ge 3; then - gt_revision_test_code=' -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -' - else - gt_revision_test_code= - fi - if test $gt_api_version -ge 2; then - gt_expression_test_code=' + * ngettext ("", "", 0)' - else - gt_expression_test_code= - fi - { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then +if test "${gt_cv_func_gnugettext1_libc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include -$gt_revision_test_code extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; int main () { bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$gt_func_gnugettext_libc=yes" +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_gnugettext1_libc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$gt_func_gnugettext_libc=no" + gt_cv_func_gnugettext1_libc=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$gt_func_gnugettext_libc'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5 +$as_echo "$gt_cv_func_gnugettext1_libc" >&6; } + if test "$gt_cv_func_gnugettext1_libc" != "yes"; then @@ -13651,7 +8959,7 @@ # Check whether --with-libintl-prefix was given. -if test "${with_libintl_prefix+set}" = set; then +if test "${with_libintl_prefix+set}" = set; then : withval=$with_libintl_prefix; if test "X$withval" = "Xno"; then use_additional=no @@ -13671,7 +8979,7 @@ else additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" + additional_libdir="$withval/lib" fi fi @@ -13680,7 +8988,6 @@ LIBINTL= LTLIBINTL= INCINTL= - LIBINTL_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -13714,50 +9021,20 @@ found_la= found_so= found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi if test $use_additional = yes; then - dir="$additional_libdir" - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi fi fi fi @@ -13775,42 +9052,19 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi fi fi ;; @@ -13823,7 +9077,7 @@ if test "X$found_dir" != "X"; then LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else haveit= @@ -13836,10 +9090,10 @@ if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$acl_hardcode_direct" = yes; then + if test "$hardcode_direct" = yes; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" haveit= for x in $rpathdirs; do @@ -13871,7 +9125,7 @@ if test -z "$haveit"; then LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" fi - if test "$acl_hardcode_minus_L" != no; then + if test "$hardcode_minus_L" != no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" @@ -13888,9 +9142,8 @@ fi additional_includedir= case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBINTL_PREFIX="$basedir" + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` additional_includedir="$basedir/include" ;; esac @@ -13900,7 +9153,7 @@ if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; + linux*) haveit=yes;; esac fi fi @@ -13939,12 +9192,12 @@ case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/lib"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/lib"; then if test -n "$GCC"; then case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; + linux*) haveit=yes;; esac fi fi @@ -13960,331 +9213,18 @@ exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" - ;; - esac - done - fi - else - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" - done - fi - - { $as_echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 -$as_echo_n "checking for GNU gettext in libintl... " >&6; } -if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *); -int -main () -{ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$gt_func_gnugettext_libintl=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$gt_func_gnugettext_libintl=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *); -int -main () -{ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" - -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS" -fi -ac_res=`eval 'as_val=${'$gt_func_gnugettext_libintl'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - fi - - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ - || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then - gt_use_preinstalled_gnugettext=yes - else - LIBINTL= - LTLIBINTL= - INCINTL= - fi - - - if test "$gt_use_preinstalled_gnugettext" != "yes"; then - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV $LIBTHREAD" - LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV $LTLIBTHREAD" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - - CATOBJEXT= - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - CATOBJEXT=.gmo - fi - - - if test -n "$INTL_MACOSX_LIBS"; then - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" - fi - fi - - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF - - else - USE_NLS=no - fi - fi - - { $as_echo "$as_me:$LINENO: checking whether to use NLS" >&5 -$as_echo_n "checking whether to use NLS... " >&6; } - { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } - if test "$USE_NLS" = "yes"; then - { $as_echo "$as_me:$LINENO: checking where the gettext function comes from" >&5 -$as_echo_n "checking where the gettext function comes from... " >&6; } - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - gt_source="external libintl" - else - gt_source="libc" - fi - else - gt_source="included intl directory" - fi - { $as_echo "$as_me:$LINENO: result: $gt_source" >&5 -$as_echo "$gt_source" >&6; } - fi - - if test "$USE_NLS" = "yes"; then - - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - { $as_echo "$as_me:$LINENO: checking how to link with libintl" >&5 -$as_echo_n "checking how to link with libintl... " >&6; } - { $as_echo "$as_me:$LINENO: result: $LIBINTL" >&5 -$as_echo "$LIBINTL" >&6; } - - for element in $INCINTL; do - haveit= - for x in $CPPFLAGS; do + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBINTL; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -14294,432 +9234,338 @@ exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" - if test "X$x" = "X$element"; then - haveit=yes - break + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" + fi + fi fi done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi done - - fi - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DCGETTEXT 1 -_ACEOF - - fi - - POSUB=po - fi - - - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then - BUILD_INCLUDED_LIBINTL=yes - fi - - - - - - nls_cv_header_intl= - nls_cv_header_libgt= - - DATADIRNAME=share - - - INSTOBJEXT=.mo - - - GENCAT=gencat - - - INTLOBJS= - if test "$USE_INCLUDED_LIBINTL" = yes; then - INTLOBJS="\$(GETTOBJS)" + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + done fi - - - INTL_LIBTOOL_SUFFIX_PREFIX= - - - - INTLLIBS="$LIBINTL" - - - - - - - - -case "$am__api_version" in - 1.01234) - { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 -$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} - { (exit 1); exit 1; }; } - ;; - *) - ;; -esac - -if test -n "0.35.0"; then - { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 -$as_echo_n "checking for intltool >= 0.35.0... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 -$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 -$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} - { (exit 1); exit 1; }; } -fi - -# Extract the first word of "intltool-update", so it can be a program name with args. -set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_UPDATE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE -if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 -$as_echo "$INTLTOOL_UPDATE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "intltool-merge", so it can be a program name with args. -set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_MERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE -if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 -$as_echo "$INTLTOOL_MERGE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - -# Extract the first word of "intltool-extract", so it can be a program name with args. -set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $INTLTOOL_EXTRACT in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT -if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 -$as_echo "$INTLTOOL_EXTRACT" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (); +int +main () +{ +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_gnugettext1_libintl=yes +else + gt_cv_func_gnugettext1_libintl=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (); +int +main () +{ +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + gt_cv_func_gnugettext1_libintl=yes - -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 -$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} - { (exit 1); exit 1; }; } fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5 +$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; } + fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + if test "$gt_cv_func_gnugettext1_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= + LTLIBINTL= + INCINTL= + fi + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + nls_cv_use_gnu_gettext=yes + fi + fi + if test "$nls_cv_use_gnu_gettext" = "yes"; then + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV" + LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + CATOBJEXT=.gmo + fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then +$as_echo "#define ENABLE_NLS 1" >>confdefs.h + else + USE_NLS=no + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +$as_echo_n "checking whether to use NLS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } + if test "$USE_NLS" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +$as_echo_n "checking where the gettext function comes from... " >&6; } + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +$as_echo "$gt_source" >&6; } + fi + if test "$USE_NLS" = "yes"; then + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +$as_echo_n "checking how to link with libintl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +$as_echo "$LIBINTL" >&6; } + for element in $INCINTL; do + haveit= + for x in $CPPFLAGS; do + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + fi +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h + fi + POSUB=po + fi + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then + BUILD_INCLUDED_LIBINTL=yes + fi + nls_cv_header_intl= + nls_cv_header_libgt= + DATADIRNAME=share + INSTOBJEXT=.mo + GENCAT=gencat + if test "$USE_INCLUDED_LIBINTL" = yes; then + INTLOBJS="\$(GETTOBJS)" + fi + INTL_LIBTOOL_SUFFIX_PREFIX= + INTLLIBS="$LIBINTL" -# Check the gettext tools to make sure they are GNU -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $XGETTEXT in - [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - ;; -esac -fi -XGETTEXT=$ac_cv_path_XGETTEXT -if test -n "$XGETTEXT"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $MSGMERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - ;; +case "$am__api_version" in + 1.01234) + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + ;; + *) + ;; esac -fi -MSGMERGE=$ac_cv_path_MSGMERGE -if test -n "$MSGMERGE"; then - { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi +if test -n "0.35.0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 +$as_echo_n "checking for intltool >= 0.35.0... " >&6; } -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 +$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 +fi + +# Extract the first word of "intltool-update", so it can be a program name with args. +set dummy intltool-update; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $MSGFMT in + case $INTLTOOL_UPDATE in [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -14727,39 +9573,39 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; esac fi -MSGFMT=$ac_cv_path_MSGFMT -if test -n "$MSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } +INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE +if test -n "$INTLTOOL_UPDATE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 +$as_echo "$INTLTOOL_UPDATE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +# Extract the first word of "intltool-merge", so it can be a program name with args. +set dummy intltool-merge; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $GMSGFMT in + case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -14767,54 +9613,39 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } +INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE +if test -n "$INTLTOOL_MERGE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 +$as_echo "$INTLTOOL_MERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } -fi - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +# Extract the first word of "intltool-extract", so it can be a program name with args. +set dummy intltool-extract; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $INTLTOOL_PERL in + case $INTLTOOL_EXTRACT in [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. + ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -14822,1311 +9653,240 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; esac fi -INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL -if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -$as_echo "$INTLTOOL_PERL" >&6; } +INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT +if test -n "$INTLTOOL_EXTRACT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 +$as_echo "$INTLTOOL_EXTRACT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test -z "$INTLTOOL_PERL"; then - { { $as_echo "$as_me:$LINENO: error: perl not found" >&5 -$as_echo "$as_me: error: perl not found" >&2;} - { (exit 1); exit 1; }; } -fi -{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5 -$as_echo_n "checking for perl >= 5.8.1... " >&6; } -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5 -$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;} - { (exit 1); exit 1; }; } -else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5 -$as_echo "$IT_PERL_VERSION" >&6; } -fi -if test "x" != "xno-xml"; then - { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 -$as_echo_n "checking for XML::Parser... " >&6; } - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } - else - { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} - { (exit 1); exit 1; }; } - fi +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi -# Substitute ALL_LINGUAS so we can use it in po/Makefile + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + + + + + + + + + + -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - DATADIRNAME=share -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - case $host in - *-*-solaris*) - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef bind_textdomain_codeset -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* 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 -#endif -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_bind_textdomain_codeset=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_bind_textdomain_codeset=no -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then - DATADIRNAME=share -else - DATADIRNAME=lib -fi - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end 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 -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_inline=$ac_kw -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - case $ac_cv_prog_cc_stdc in - no) ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; - *) { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if test "${ac_cv_prog_cc_c99+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -#include -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; -struct incomplete_array -{ - int datasize; - double data[]; -}; -struct named_init { - int number; - const wchar_t *name; - double average; -}; -typedef const char *ccp; -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - const char *str; - int number; - float fnumber; - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} -int -main () -{ - // Check bool. - _Bool success = false; - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - ni.number = 58; - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); - ; - return 0; -} -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c99=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c99" != xno; then - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 -else - { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end 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; -} -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -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 -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 -else - ac_cv_prog_cc_stdc=no -fi -fi - ;; -esac - { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO Standard C" >&5 -$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } - if test "${ac_cv_prog_cc_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 -fi - case $ac_cv_prog_cc_stdc in - no) { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - '') { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - *) { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; -esac -if test "x$CC" != xcc; then - { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -cat >>confdefs.h <<\_ACEOF -#define NO_MINUS_C_MINUS_O 1 -_ACEOF -fi -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - done - ac_cv_prog_CPP=$CPP -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +# Check the gettext tools to make sure they are GNU +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if test "${ac_cv_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $XGETTEXT in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS + ;; +esac fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 -$as_echo "$AWK" >&6; } +XGETTEXT=$ac_cv_path_XGETTEXT +if test -n "$XGETTEXT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$AWK" && break -done - -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done -done -IFS=$as_save_IFS - -fi - - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" - fi -fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } - - -for ac_prog in flex lex -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LEX+set}" = set; then +if test "${ac_cv_path_MSGMERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$LEX"; then - ac_cv_prog_LEX="$LEX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $MSGMERGE in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LEX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS -fi -fi -LEX=$ac_cv_prog_LEX -if test -n "$LEX"; then - { $as_echo "$as_me:$LINENO: result: $LEX" >&5 -$as_echo "$LEX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$LEX" && break -done -test -n "$LEX" || LEX=":" - -if test "x$LEX" != "x:"; then - cat >conftest.l <<_ACEOF -%% -a { ECHO; } -b { REJECT; } -c { yymore (); } -d { yyless (1); } -e { yyless (input () != 0); } -f { unput (yytext[0]); } -. { BEGIN INITIAL; } -%% -#ifdef YYTEXT_POINTER -extern char *yytext; -#endif -int -main (void) -{ - return ! yylex () + ! yywrap (); -} -_ACEOF -{ (ac_try="$LEX conftest.l" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$LEX conftest.l") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5 -$as_echo_n "checking lex output file root... " >&6; } -if test "${ac_cv_prog_lex_root+set}" = set; then - $as_echo_n "(cached) " >&6 -else - -if test -f lex.yy.c; then - ac_cv_prog_lex_root=lex.yy -elif test -f lexyy.c; then - ac_cv_prog_lex_root=lexyy -else - { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 -$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} - { (exit 1); exit 1; }; } -fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 -$as_echo "$ac_cv_prog_lex_root" >&6; } -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root - -if test -z "${LEXLIB+set}"; then - { $as_echo "$as_me:$LINENO: checking lex library" >&5 -$as_echo_n "checking lex library... " >&6; } -if test "${ac_cv_lib_lex+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - ac_save_LIBS=$LIBS - ac_cv_lib_lex='none needed' - for ac_lib in '' -lfl -ll; do - LIBS="$ac_lib $ac_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -`cat $LEX_OUTPUT_ROOT.c` -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_lex=$ac_lib -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - test "$ac_cv_lib_lex" != 'none needed' && break - done - LIBS=$ac_save_LIBS - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5 -$as_echo "$ac_cv_lib_lex" >&6; } - test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex -fi - - -{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5 -$as_echo_n "checking whether yytext is a pointer... " >&6; } -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # POSIX says lex can declare yytext either as a pointer or an array; the -# default is implementation-dependent. Figure out which it is, since -# not all implementations provide the %pointer and %array declarations. -ac_cv_prog_lex_yytext_pointer=no -ac_save_LIBS=$LIBS -LIBS="$LEXLIB $ac_save_LIBS" -cat >conftest.$ac_ext <<_ACEOF -#define YYTEXT_POINTER 1 -`cat $LEX_OUTPUT_ROOT.c` -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_prog_lex_yytext_pointer=yes +MSGMERGE=$ac_cv_path_MSGMERGE +if test -n "$MSGMERGE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_save_LIBS - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5 -$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } -if test $ac_cv_prog_lex_yytext_pointer = yes; then - -cat >>confdefs.h <<\_ACEOF -#define YYTEXT_POINTER 1 -_ACEOF -fi -rm -f conftest.l $LEX_OUTPUT_ROOT.c -fi -if test "$LEX" = :; then - LEX=${am_missing_run}flex -fi -# Extract the first word of "$LEX", so it can be a program name with args. -set dummy $LEX; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_LEX_PATH+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $LEX_PATH in + case $MSGFMT in [\\/]* | ?:[\\/]*) - ac_cv_path_LEX_PATH="$LEX_PATH" # Let the user override the test with a path. + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -16134,96 +9894,90 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_LEX_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - test -z "$ac_cv_path_LEX_PATH" && ac_cv_path_LEX_PATH="notfound" ;; esac fi -LEX_PATH=$ac_cv_path_LEX_PATH -if test -n "$LEX_PATH"; then - { $as_echo "$as_me:$LINENO: result: $LEX_PATH" >&5 -$as_echo "$LEX_PATH" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$LEX_PATH" = "notfound" ; then - { { $as_echo "$as_me:$LINENO: error: Couldn't find a usable lex program. -Please install flex which is available from -ftp://ftp.gnu.org/pub/non-gnu/flex/ -" >&5 -$as_echo "$as_me: error: Couldn't find a usable lex program. -Please install flex which is available from -ftp://ftp.gnu.org/pub/non-gnu/flex/ -" >&2;} - { (exit 1); exit 1; }; } +MSGFMT=$ac_cv_path_MSGFMT +if test -n "$MSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -for ac_prog in 'bison -y' byacc -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +# Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_YACC+set}" = set; then +if test "${ac_cv_path_GMSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_YACC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac fi -fi -YACC=$ac_cv_prog_YACC -if test -n "$YACC"; then - { $as_echo "$as_me:$LINENO: result: $YACC" >&5 -$as_echo "$YACC" >&6; } +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 +fi -# Extract the first word of "$YACC", so it can be a program name with args. -set dummy $YACC; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +# Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_YACC_PATH+set}" = set; then +if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $YACC_PATH in + case $INTLTOOL_PERL in [\\/]* | ?:[\\/]*) - ac_cv_path_YACC_PATH="$YACC_PATH" # Let the user override the test with a path. + ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -16231,803 +9985,910 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_YACC_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - test -z "$ac_cv_path_YACC_PATH" && ac_cv_path_YACC_PATH="notfound" ;; esac fi -YACC_PATH=$ac_cv_path_YACC_PATH -if test -n "$YACC_PATH"; then - { $as_echo "$as_me:$LINENO: result: $YACC_PATH" >&5 -$as_echo "$YACC_PATH" >&6; } +INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL +if test -n "$INTLTOOL_PERL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 +$as_echo "$INTLTOOL_PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test "$YACC_PATH" = "notfound" ; then - { { $as_echo "$as_me:$LINENO: error: Couldn't find a usable yacc program. -Please install bison which is available from -ftp://ftp.gnu.org/pub/gnu/bison/ -" >&5 -$as_echo "$as_me: error: Couldn't find a usable yacc program. -Please install bison which is available from -ftp://ftp.gnu.org/pub/gnu/bison/ -" >&2;} - { (exit 1); exit 1; }; } +if test -z "$INTLTOOL_PERL"; then + as_fn_error $? "perl not found" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 +$as_echo_n "checking for perl >= 5.8.1... " >&6; } +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 +$as_echo "$IT_PERL_VERSION" >&6; } +fi +if test "x" != "xno-xml"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 +$as_echo_n "checking for XML::Parser... " >&6; } + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + else + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 + fi fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +# Substitute ALL_LINGUAS so we can use it in po/Makefile + + +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + DATADIRNAME=share +else + case $host in + *-*-solaris*) + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + DATADIRNAME=share +else + DATADIRNAME=lib +fi + + ;; + *) + DATADIRNAME=lib + ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if test "${ac_cv_c_inline+set}" = set; then : $as_echo_n "(cached) " >&6 else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end 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 +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } + +case $ac_cv_c_inline in + inline | yes) ;; *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF ;; esac -done -IFS=$as_save_IFS + case $ac_cv_prog_cc_stdc in #( + no) : + ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #( + *) : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if test "${ac_cv_prog_cc_c99+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; -rm -rf conftest.one conftest.two conftest.dir +typedef const char *ccp; -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + const char *str; + int number; + float fnumber; -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} -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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +int +main () +{ -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi + // Check bool. + _Bool success = false; + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; -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 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&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 + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break done -IFS=$as_save_IFS +rm -f conftest.$ac_ext +CC=$ac_save_CC fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; esac - RANLIB=$ac_ct_RANLIB - fi +if test "x$ac_cv_prog_cc_c99" != xno; then : + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 else - RANLIB="$ac_cv_prog_RANLIB" -fi - - -# -# Used for building the icons -# -# Extract the first word of "xpmtoppm", so it can be a program name with args. -set dummy xpmtoppm; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XPMTOPPM+set}" = set; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $XPMTOPPM in - [\\/]* | ?:[\\/]*) - ac_cv_path_XPMTOPPM="$XPMTOPPM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end 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; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +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 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_XPMTOPPM="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -IFS=$as_save_IFS +rm -f conftest.$ac_ext +CC=$ac_save_CC - test -z "$ac_cv_path_XPMTOPPM" && ac_cv_path_XPMTOPPM="notfound" - ;; -esac fi -XPMTOPPM=$ac_cv_path_XPMTOPPM -if test -n "$XPMTOPPM"; then - { $as_echo "$as_me:$LINENO: result: $XPMTOPPM" >&5 -$as_echo "$XPMTOPPM" >&6; } +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_prog_cc_stdc=no fi - -# Extract the first word of "ppmtowinicon", so it can be a program name with args. -set dummy ppmtowinicon; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PPMTOWINICON+set}" = set; then +fi + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 +$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } + if test "${ac_cv_prog_cc_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 -else - case $PPMTOWINICON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PPMTOWINICON="$PPMTOWINICON" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PPMTOWINICON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +fi - test -z "$ac_cv_path_PPMTOWINICON" && ac_cv_path_PPMTOWINICON="notfound" - ;; + case $ac_cv_prog_cc_stdc in #( + no) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; #( + '') : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; #( + *) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5 +$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; esac -fi -PPMTOWINICON=$ac_cv_path_PPMTOWINICON -if test -n "$PPMTOWINICON"; then - { $as_echo "$as_me:$LINENO: result: $PPMTOWINICON" >&5 -$as_echo "$PPMTOWINICON" >&6; } + +if test "x$CC" != xcc; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 +$as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi - - -# Extract the first word of "convert", so it can be a program name with args. -set dummy convert; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CONVERT+set}" = set; then +set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : $as_echo_n "(cached) " >&6 else - case $CONVERT in - [\\/]* | ?:[\\/]*) - ac_cv_path_CONVERT="$CONVERT" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_CONVERT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - test -z "$ac_cv_path_CONVERT" && ac_cv_path_CONVERT="notfound" - ;; +int +main () +{ + + ; + return 0; +} +_ACEOF +# Make sure it works both with $CC and with simple cc. +# We do the test twice because some compilers refuse to overwrite an +# existing .o file with -o, though they will create one. +ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +rm -f conftest2.* +if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -CONVERT=$ac_cv_path_CONVERT -if test -n "$CONVERT"; then - { $as_echo "$as_me:$LINENO: result: $CONVERT" >&5 -$as_echo "$CONVERT" >&6; } +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; +then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. + if { ac_try='cc -c conftest.$ac_ext >&5' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* + if { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; + then + # cc works too. + : + else + # cc exists but doesn't like -o. + eval ac_cv_prog_cc_${ac_cc}_c_o=no + fi + fi + fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + eval ac_cv_prog_cc_${ac_cc}_c_o=no fi +rm -f core conftest* - - -########################################################################## -# -# -if test "X$docs_yesno" = "Xyes" -a "X$pcb_git_version" = "Xyes" ; then - # Extract the first word of "makeinfo", so it can be a program name with args. -set dummy makeinfo; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MKINFO+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $MKINFO in - [\\/]* | ?:[\\/]*) - ac_cv_path_MKINFO="$MKINFO" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_MKINFO="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_MKINFO" && ac_cv_path_MKINFO="no" - ;; -esac fi -MKINFO=$ac_cv_path_MKINFO -if test -n "$MKINFO"; then - { $as_echo "$as_me:$LINENO: result: $MKINFO" >&5 -$as_echo "$MKINFO" >&6; } +if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h + fi +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi - if test "X$MKINFO" != "Xno"; then - { $as_echo "$as_me:$LINENO: checking for GNU makeinfo version >= 4.6" >&5 -$as_echo_n "checking for GNU makeinfo version >= 4.6... " >&6; } - v=`$MKINFO --version | grep "GNU texinfo"` - if test $? -ne 0; then - { $as_echo "$as_me:$LINENO: result: non-GNU" >&5 -$as_echo "non-GNU" >&6; } - MKINFO="no" - fi - fi - if test "X$MKINFO" != "Xno"; then - vmajor=`echo "$v" | sed 's/.* \([0-9]*\)\.\([0-9]*\)$/\1/'` - vminor=`echo "$v" | sed 's/.* \([0-9]*\)\.\([0-9]*\)$/\2/'` - { $as_echo "$as_me:$LINENO: result: $vmajor.$vminor" >&5 -$as_echo "$vmajor.$vminor" >&6; } - if test "$vmajor" -lt 4 \ - || (test "$vmajor" -eq 4 && test "$vminor" -lt 6); then - MKINFO=no - fi - fi - if test "X$MKINFO" = "Xno"; then - { { $as_echo "$as_me:$LINENO: error: You have requested a build -of the documentation. For this to work, you must have version 4.6 or newer of -the GNU texinfo package. You seem to have -$v +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext -Please update to a newer version of texinfo or disable building of -the documentation with --disable-doc -" >&5 -$as_echo "$as_me: error: You have requested a build -of the documentation. For this to work, you must have version 4.6 or newer of -the GNU texinfo package. You seem to have + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext -$v +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi -Please update to a newer version of texinfo or disable building of -the documentation with --disable-doc -" >&2;} - { (exit 1); exit 1; }; } - fi + done + ac_cv_prog_CPP=$CPP - # Extract the first word of "texi2dvi", so it can be a program name with args. -set dummy texi2dvi; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_TEXI2DVI+set}" = set; then - $as_echo_n "(cached) " >&6 +fi + CPP=$ac_cv_prog_CPP else - case $TEXI2DVI in - [\\/]* | ?:[\\/]*) - ac_cv_path_TEXI2DVI="$TEXI2DVI" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_TEXI2DVI="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : - test -z "$ac_cv_path_TEXI2DVI" && ac_cv_path_TEXI2DVI="no" - ;; -esac +else + # Broken: fails on valid input. +continue fi -TEXI2DVI=$ac_cv_path_TEXI2DVI -if test -n "$TEXI2DVI"; then - { $as_echo "$as_me:$LINENO: result: $TEXI2DVI" >&5 -$as_echo "$TEXI2DVI" >&6; } +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + # Passes both tests. +ac_preproc_ok=: +break fi +rm -f conftest.err conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : - if test "X$TEXI2DVI" = "Xno"; then - { { $as_echo "$as_me:$LINENO: error: You have requested a build -of the documentation. For this to work, you must have the texi2dvi program -installed. Alternatively, you can disable building the documentation with ---disable-doc." >&5 -$as_echo "$as_me: error: You have requested a build -of the documentation. For this to work, you must have the texi2dvi program -installed. Alternatively, you can disable building the documentation with ---disable-doc." >&2;} - { (exit 1); exit 1; }; } - fi +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - # Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="notfound" - ;; -esac fi -PERL=$ac_cv_path_PERL -if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 -$as_echo "$PERL" >&6; } +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "X$PERL" = "Xnotfound"; then - { { $as_echo "$as_me:$LINENO: error: You have requested a build -of the documentation. For this to work, you must have perl installed. -Alternatively, you can disable building the documentation with ---disable-doc. -" >&5 -$as_echo "$as_me: error: You have requested a build -of the documentation. For this to work, you must have perl installed. -Alternatively, you can disable building the documentation with ---disable-doc. -" >&2;} - { (exit 1); exit 1; }; } - fi + test -n "$AWK" && break +done - # Extract the first word of "kpsewhich", so it can be a program name with args. -set dummy kpsewhich; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + +for ac_prog in flex lex +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_KPSEWHICH+set}" = set; then +if test "${ac_cv_prog_LEX+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $KPSEWHICH in - [\\/]* | ?:[\\/]*) - ac_cv_path_KPSEWHICH="$KPSEWHICH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$LEX"; then + ac_cv_prog_LEX="$LEX" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_KPSEWHICH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_LEX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - test -z "$ac_cv_path_KPSEWHICH" && ac_cv_path_KPSEWHICH="no" - ;; -esac fi -KPSEWHICH=$ac_cv_path_KPSEWHICH -if test -n "$KPSEWHICH"; then - { $as_echo "$as_me:$LINENO: result: $KPSEWHICH" >&5 -$as_echo "$KPSEWHICH" >&6; } +fi +LEX=$ac_cv_prog_LEX +if test -n "$LEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +$as_echo "$LEX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "X$KPSEWHICH" = "Xno"; then - { { $as_echo "$as_me:$LINENO: error: You have requested a build -of the documentation. For this to work, you must have a functional install of -TeX and LaTeX. kpsewhich is part of TeX. -Alternatively, you can disable building the documentation with ---disable-doc." >&5 -$as_echo "$as_me: error: You have requested a build -of the documentation. For this to work, you must have a functional install of -TeX and LaTeX. kpsewhich is part of TeX. -Alternatively, you can disable building the documentation with ---disable-doc." >&2;} - { (exit 1); exit 1; }; } - fi - - { $as_echo "$as_me:$LINENO: checking If your TeX installation contains epsf.tex" >&5 -$as_echo_n "checking If your TeX installation contains epsf.tex... " >&6; } - f=`$KPSEWHICH epsf.tex` - if test $? -eq 0 ; then - { $as_echo "$as_me:$LINENO: result: yes ($f)" >&5 -$as_echo "yes ($f)" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: You have requested a build -of the documentation. For this to work, you must have a functional install of -TeX and LaTeX that includes epsf.tex. On some linux distributions this is -part of the texlive-generic-recommended package. -Alternatively, you can disable building the documentation with ---disable-doc." >&5 -$as_echo "$as_me: error: You have requested a build -of the documentation. For this to work, you must have a functional install of -TeX and LaTeX that includes epsf.tex. On some linux distributions this is -part of the texlive-generic-recommended package. -Alternatively, you can disable building the documentation with ---disable-doc." >&2;} - { (exit 1); exit 1; }; } - fi - -fi - -########################################################################## -# -# + test -n "$LEX" && break +done +test -n "$LEX" || LEX=":" -# FIXME: for now, only try to add -rdynamic if we're using gcc. We really -# need to figure out what the correct test is here. In the mean time, this -# should let things build with SunPRO again. -if test "x$GCC" = "xyes"; then -{ $as_echo "$as_me:$LINENO: checking If the compiler accepts -rdynamic" >&5 -$as_echo_n "checking If the compiler accepts -rdynamic... " >&6; } -old_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS -rdynamic" -cat >conftest.$ac_ext <<_ACEOF -int main(){} +if test "x$LEX" != "x:"; then + cat >conftest.l <<_ACEOF +%% +a { ECHO; } +b { REJECT; } +c { yymore (); } +d { yyless (1); } +e { yyless (input () != 0); } +f { unput (yytext[0]); } +. { BEGIN INITIAL; } +%% +#ifdef YYTEXT_POINTER +extern char *yytext; +#endif +int +main (void) +{ + return ! yylex () + ! yywrap (); +} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +{ { ac_try="$LEX conftest.l" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$LEX conftest.l") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 +$as_echo_n "checking lex output file root... " >&6; } +if test "${ac_cv_prog_lex_root+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LDFLAGS="$old_LDFLAGS" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } +if test -f lex.yy.c; then + ac_cv_prog_lex_root=lex.yy +elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy +else + as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +$as_echo "$ac_cv_prog_lex_root" >&6; } +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -# ------------- HID config ------------------- - -hid_guis="" -hid_printers="" -hid_exporters="" -hid_always="" - -for hid in `cd $srcdir/src/hid; echo *`; do - F=$srcdir/src/hid/$hid/hid.conf - if test -f $F - then - echo checking $F - . $F - case $type in - gui ) hid_guis="$hid_guis $hid" ;; - printer ) hid_printers="$hid_printers $hid" ;; - export ) hid_exporters="$hid_exporters $hid" ;; - always ) hid_always="$hid_always $hid" ;; - esac - fi -done - -{ $as_echo "$as_me:$LINENO: checking for which gui to use" >&5 -$as_echo_n "checking for which gui to use... " >&6; } - -# Check whether --with-gui was given. -if test "${with_gui+set}" = set; then - withval=$with_gui; +if test -z "${LEXLIB+set}"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 +$as_echo_n "checking lex library... " >&6; } +if test "${ac_cv_lib_lex+set}" = set; then : + $as_echo_n "(cached) " >&6 else - with_gui=gtk + ac_save_LIBS=$LIBS + ac_cv_lib_lex='none needed' + for ac_lib in '' -lfl -ll; do + LIBS="$ac_lib $ac_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +`cat $LEX_OUTPUT_ROOT.c` +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lex=$ac_lib fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + test "$ac_cv_lib_lex" != 'none needed' && break + done + LIBS=$ac_save_LIBS -{ $as_echo "$as_me:$LINENO: result: $with_gui" >&5 -$as_echo "$with_gui" >&6; } -case " $hid_guis no none " in - *\ $with_gui\ * ) HIDLIST="$with_gui" ;; - * ) { { $as_echo "$as_me:$LINENO: error: $with_gui is not a valid gui" >&5 -$as_echo "$as_me: error: $with_gui is not a valid gui" >&2;} - { (exit 1); exit 1; }; } ;; -esac - -if test x"$with_gui" = x"none" -o x"$with_gui" = x"no" -then - HIDLIST= fi - -{ $as_echo "$as_me:$LINENO: checking whether to enable toporouter" >&5 -$as_echo_n "checking whether to enable toporouter... " >&6; } -# Check whether --enable-toporouter was given. -if test "${enable_toporouter+set}" = set; then - enableval=$enable_toporouter; +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 +$as_echo "$ac_cv_lib_lex" >&6; } + test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex fi -case "x$enable_toporouter" in - xyes | xno) : ;; - *) enable_toporouter=yes - - ;; -esac -{ $as_echo "$as_me:$LINENO: result: $enable_toporouter" >&5 -$as_echo "$enable_toporouter" >&6; } - if test $enable_toporouter != no; then - WITH_TOPOROUTER_TRUE= - WITH_TOPOROUTER_FALSE='#' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 +$as_echo_n "checking whether yytext is a pointer... " >&6; } +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then : + $as_echo_n "(cached) " >&6 else - WITH_TOPOROUTER_TRUE='#' - WITH_TOPOROUTER_FALSE= + # POSIX says lex can declare yytext either as a pointer or an array; the +# default is implementation-dependent. Figure out which it is, since +# not all implementations provide the %pointer and %array declarations. +ac_cv_prog_lex_yytext_pointer=no +ac_save_LIBS=$LIBS +LIBS="$LEXLIB $ac_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define YYTEXT_POINTER 1 +`cat $LEX_OUTPUT_ROOT.c` +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_prog_lex_yytext_pointer=yes fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_save_LIBS - -{ $as_echo "$as_me:$LINENO: checking whether to enable toporouter output" >&5 -$as_echo_n "checking whether to enable toporouter output... " >&6; } -# Check whether --enable-toporouter-output was given. -if test "${enable_toporouter_output+set}" = set; then - enableval=$enable_toporouter_output; fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 +$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } +if test $ac_cv_prog_lex_yytext_pointer = yes; then -case "z$enable_toporouter_output" in - zyes | zno) : ;; - *) enable_toporouter_output=no - ;; -esac - -{ $as_echo "$as_me:$LINENO: result: $enable_toporouter_output" >&5 -$as_echo "$enable_toporouter_output" >&6; } -case $enable_toporouter_output in - yes) - topo_output_enabled=1 - ;; - *) - topo_output_enabled=0 - - ;; -esac - - -cat >>confdefs.h <<_ACEOF -#define TOPO_OUTPUT_ENABLED $topo_output_enabled -_ACEOF - - +$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h +fi +rm -f conftest.l $LEX_OUTPUT_ROOT.c -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +fi +if test "$LEX" = :; then + LEX=${am_missing_run}flex +fi +# Extract the first word of "$LEX", so it can be a program name with args. +set dummy $LEX; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_LEX_PATH+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $PKG_CONFIG in + case $LEX_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ac_cv_path_LEX_PATH="$LEX_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -17035,519 +10896,486 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_LEX_PATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS + test -z "$ac_cv_path_LEX_PATH" && ac_cv_path_LEX_PATH="notfound" ;; esac fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } +LEX_PATH=$ac_cv_path_LEX_PATH +if test -n "$LEX_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX_PATH" >&5 +$as_echo "$LEX_PATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi +if test "$LEX_PATH" = "notfound" ; then + as_fn_error $? "Couldn't find a usable lex program. +Please install flex which is available from +ftp://ftp.gnu.org/pub/non-gnu/flex/ +" "$LINENO" 5 fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + + +for ac_prog in 'bison -y' byacc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if test "${ac_cv_prog_YACC+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_YACC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi - -fi - -if test "x$enable_toporouter_output" = "xyes"; then - -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for CAIRO" >&5 -$as_echo_n "checking for CAIRO... " >&6; } - -if test -n "$CAIRO_CFLAGS"; then - pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo\"") >&5 - ($PKG_CONFIG --exists --print-errors "cairo") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo" 2>/dev/null` -else - pkg_failed=yes fi - else - pkg_failed=untried fi -if test -n "$CAIRO_LIBS"; then - pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo\"") >&5 - ($PKG_CONFIG --exists --print-errors "cairo") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo" 2>/dev/null` +YACC=$ac_cv_prog_YACC +if test -n "$YACC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +$as_echo "$YACC" >&6; } else - pkg_failed=yes -fi - else - pkg_failed=untried + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$YACC" && break +done +test -n "$YACC" || YACC="yacc" -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +# Extract the first word of "$YACC", so it can be a program name with args. +set dummy $YACC; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_YACC_PATH+set}" = set; then : + $as_echo_n "(cached) " >&6 else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo" 2>&1` - else - CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$CAIRO_PKG_ERRORS" >&5 + case $YACC_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_YACC_PATH="$YACC_PATH" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_YACC_PATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - { $as_echo "$as_me:$LINENO: result: no" >&5 + test -z "$ac_cv_path_YACC_PATH" && ac_cv_path_YACC_PATH="notfound" + ;; +esac +fi +YACC_PATH=$ac_cv_path_YACC_PATH +if test -n "$YACC_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC_PATH" >&5 +$as_echo "$YACC_PATH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: Cannot find cairo, needed by the toporouter -Please review the following errors: -$CAIRO_PKG_ERRORS" >&5 -$as_echo "$as_me: error: Cannot find cairo, needed by the toporouter -Please review the following errors: -$CAIRO_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } +fi -elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: Cannot find cairo, needed by the toporouter -Please review the following errors: -$CAIRO_PKG_ERRORS" >&5 -$as_echo "$as_me: error: Cannot find cairo, needed by the toporouter -Please review the following errors: -$CAIRO_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } -else - CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS - CAIRO_LIBS=$pkg_cv_CAIRO_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi +if test "$YACC_PATH" = "notfound" ; then + as_fn_error $? "Couldn't find a usable yacc program. +Please install bison which is available from +ftp://ftp.gnu.org/pub/gnu/bison/ +" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking for whether to use DBUS" >&5 -$as_echo_n "checking for whether to use DBUS... " >&6; } -# Check whether --enable-dbus was given. -if test "${enable_dbus+set}" = set; then - enableval=$enable_dbus; -else - case " $with_gui " in - *\ gtk\ *) enable_dbus=yes ;; - *\ lesstif\ *) enable_dbus=yes ;; - * ) enable_dbus=no ;; - esac +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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi - - -{ $as_echo "$as_me:$LINENO: result: $enable_dbus" >&5 -$as_echo "$enable_dbus" >&6; } - if test x$enable_dbus = xyes; then - WITH_DBUS_TRUE= - WITH_DBUS_FALSE='#' +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - WITH_DBUS_TRUE='#' - WITH_DBUS_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test "x$enable_dbus" = "xyes"; then - case " $with_gui " in - *\ gtk\ *) ;; - *\ lesstif\ *) ;; - * ) { { $as_echo "$as_me:$LINENO: error: DBUS enabled but only works with a mainloop capable GUI HID. -Either do not use --enable-dbus or enable the gtk or lesstif GUI HID." >&5 -$as_echo "$as_me: error: DBUS enabled but only works with a mainloop capable GUI HID. -Either do not use --enable-dbus or enable the gtk or lesstif GUI HID." >&2;} - { (exit 1); exit 1; }; } - esac - - -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5 -$as_echo_n "checking for DBUS... " >&6; } - -if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.61\"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.61") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.61" 2>/dev/null` +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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else - pkg_failed=yes + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi - else - pkg_failed=untried fi -if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.61\"") >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.61") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.61" 2>/dev/null` +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - pkg_failed=yes -fi - else - pkg_failed=untried + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else - _pkg_short_errors_supported=no + RANLIB="$ac_cv_prog_RANLIB" fi - if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.61" 2>&1` - else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.61" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DBUS_PKG_ERRORS" >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: Cannot find dbus-1 >= 0.61, install it and rerun ./configure -Please review the following errors: -$DBUS_PKG_ERRORS" >&5 -$as_echo "$as_me: error: Cannot find dbus-1 >= 0.61, install it and rerun ./configure -Please review the following errors: -$DBUS_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } - -elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: Cannot find dbus-1 >= 0.61, install it and rerun ./configure -Please review the following errors: -$DBUS_PKG_ERRORS" >&5 -$as_echo "$as_me: error: Cannot find dbus-1 >= 0.61, install it and rerun ./configure -Please review the following errors: -$DBUS_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } -else - DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS - DBUS_LIBS=$pkg_cv_DBUS_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - saved_LIBS="$LIBS" - LIBS="$LIBS $DBUS_LIBS" -for ac_func in dbus_watch_get_unix_fd -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +# +# Used for building the icons +# +# Extract the first word of "xpmtoppm", so it can be a program name with args. +set dummy xpmtoppm; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XPMTOPPM+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif + case $XPMTOPPM in + [\\/]* | ?:[\\/]*) + ac_cv_path_XPMTOPPM="$XPMTOPPM" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XPMTOPPM="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + test -z "$ac_cv_path_XPMTOPPM" && ac_cv_path_XPMTOPPM="notfound" + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +fi +XPMTOPPM=$ac_cv_path_XPMTOPPM +if test -n "$XPMTOPPM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XPMTOPPM" >&5 +$as_echo "$XPMTOPPM" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi +# Extract the first word of "ppmtowinicon", so it can be a program name with args. +set dummy ppmtowinicon; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PPMTOWINICON+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $PPMTOWINICON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PPMTOWINICON="$PPMTOWINICON" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PPMTOWINICON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS - LIBS="$saved_LIBS" + test -z "$ac_cv_path_PPMTOWINICON" && ac_cv_path_PPMTOWINICON="notfound" + ;; +esac +fi +PPMTOWINICON=$ac_cv_path_PPMTOWINICON +if test -n "$PPMTOWINICON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PPMTOWINICON" >&5 +$as_echo "$PPMTOWINICON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - DBUS_VERSION=`$PKG_CONFIG dbus-1 --modversion` - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DBUS 1 -_ACEOF +# Extract the first word of "convert", so it can be a program name with args. +set dummy convert; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CONVERT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $CONVERT in + [\\/]* | ?:[\\/]*) + ac_cv_path_CONVERT="$CONVERT" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CONVERT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + test -z "$ac_cv_path_CONVERT" && ac_cv_path_CONVERT="notfound" + ;; +esac fi - -{ $as_echo "$as_me:$LINENO: checking for which printer to use" >&5 -$as_echo_n "checking for which printer to use... " >&6; } - -# Check whether --with-printer was given. -if test "${with_printer+set}" = set; then - withval=$with_printer; +CONVERT=$ac_cv_path_CONVERT +if test -n "$CONVERT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONVERT" >&5 +$as_echo "$CONVERT" >&6; } else - with_printer=lpr + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:$LINENO: result: $with_printer" >&5 -$as_echo "$with_printer" >&6; } -case " $hid_printers " in - *\ $with_printer\ * ) - HIDLIST="$HIDLIST $with_printer" - ;; - * ) { { $as_echo "$as_me:$LINENO: error: $with_printer is not a valid printer" >&5 -$as_echo "$as_me: error: $with_printer is not a valid printer" >&2;} - { (exit 1); exit 1; }; } ;; -esac -{ $as_echo "$as_me:$LINENO: checking for which exporters to use" >&5 -$as_echo_n "checking for which exporters to use... " >&6; } -# Check whether --with-exporters was given. -if test "${with_exporters+set}" = set; then - withval=$with_exporters; +########################################################################## +# +# +if test "X$docs_yesno" = "Xyes" -a "X$pcb_git_version" = "Xyes" ; then + # Extract the first word of "makeinfo", so it can be a program name with args. +set dummy makeinfo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MKINFO+set}" = set; then : + $as_echo_n "(cached) " >&6 else - with_exporters=$hid_exporters + case $MKINFO in + [\\/]* | ?:[\\/]*) + ac_cv_path_MKINFO="$MKINFO" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MKINFO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_MKINFO" && ac_cv_path_MKINFO="no" + ;; +esac +fi +MKINFO=$ac_cv_path_MKINFO +if test -n "$MKINFO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKINFO" >&5 +$as_echo "$MKINFO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:$LINENO: result: $with_exporters" >&5 -$as_echo "$with_exporters" >&6; } -for e in `echo $with_exporters | sed 's/,/ /g'`; do - case " $hid_exporters " in - *\ $e\ * ) - HIDLIST="$HIDLIST $e" - ;; - * ) { { $as_echo "$as_me:$LINENO: error: $e is not a valid exporter" >&5 -$as_echo "$as_me: error: $e is not a valid exporter" >&2;} - { (exit 1); exit 1; }; } ;; - esac -done -if test "X$enable_jpeg" = "Xno" -a "X$enable_gif" = "Xno" -a "X$enable_png" = "Xno" ; then - case " ${HIDLIST} " in - *\ png\ *) - { { $as_echo "$as_me:$LINENO: error: you have requested the png HID but turned off all output -formats! If you do not want gif/jpeg/png output, use --with-exporters to list -which exporters you want and do not list png there." >&5 -$as_echo "$as_me: error: you have requested the png HID but turned off all output -formats! If you do not want gif/jpeg/png output, use --with-exporters to list -which exporters you want and do not list png there." >&2;} - { (exit 1); exit 1; }; } - ;; + if test "X$MKINFO" != "Xno"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU makeinfo version >= 4.6" >&5 +$as_echo_n "checking for GNU makeinfo version >= 4.6... " >&6; } + v=`$MKINFO --version | grep "GNU texinfo"` + if test $? -ne 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: non-GNU" >&5 +$as_echo "non-GNU" >&6; } + MKINFO="no" + fi + fi + if test "X$MKINFO" != "Xno"; then + vmajor=`echo "$v" | sed 's/.* \([0-9]*\)\.\([0-9]*\)$/\1/'` + vminor=`echo "$v" | sed 's/.* \([0-9]*\)\.\([0-9]*\)$/\2/'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vmajor.$vminor" >&5 +$as_echo "$vmajor.$vminor" >&6; } + if test "$vmajor" -lt 4 \ + || (test "$vmajor" -eq 4 && test "$vminor" -lt 6); then + MKINFO=no + fi + fi + if test "X$MKINFO" = "Xno"; then + as_fn_error $? "You have requested a build +of the documentation. For this to work, you must have version 4.6 or newer of +the GNU texinfo package. You seem to have - *) - ;; - esac -fi +$v -for hid in $HIDLIST; do - F=$srcdir/src/hid/$hid/hid.conf - if test -f $F ; then - echo checking $hid depedencies - deps= - . $F - for dep in $deps; do - if test "X`echo $HIDLIST | grep $dep`" = "X"; then - { { $as_echo "$as_me:$LINENO: error: you have requested the $hid HID but not the $dep HID, which it depends on" >&5 -$as_echo "$as_me: error: you have requested the $hid HID but not the $dep HID, which it depends on" >&2;} - { (exit 1); exit 1; }; } - fi - done +Please update to a newer version of texinfo or disable building of +the documentation with --disable-doc +" "$LINENO" 5 fi -done -for e in $HIDLIST; do - HIDLIBS="$HIDLIBS lib$e.a" + # Extract the first word of "texi2dvi", so it can be a program name with args. +set dummy texi2dvi; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_TEXI2DVI+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $TEXI2DVI in + [\\/]* | ?:[\\/]*) + ac_cv_path_TEXI2DVI="$TEXI2DVI" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_TEXI2DVI="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS + test -z "$ac_cv_path_TEXI2DVI" && ac_cv_path_TEXI2DVI="no" + ;; +esac +fi +TEXI2DVI=$ac_cv_path_TEXI2DVI +if test -n "$TEXI2DVI"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEXI2DVI" >&5 +$as_echo "$TEXI2DVI" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "X$TEXI2DVI" = "Xno"; then + as_fn_error $? "You have requested a build +of the documentation. For this to work, you must have the texi2dvi program +installed. Alternatively, you can disable building the documentation with +--disable-doc." "$LINENO" 5 + fi -# ------------- end HID config ------------------- - -###################################################################### -# -# desktop integration -# -# Extract the first word of "env", so it can be a program name with args. -set dummy env; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SETENV+set}" = set; then +if test "${ac_cv_path_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $SETENV in + case $PERL in [\\/]* | ?:[\\/]*) - ac_cv_path_SETENV="$SETENV" # Let the user override the test with a path. + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -17555,39 +11383,49 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_SETENV="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS + test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="notfound" ;; esac fi -SETENV=$ac_cv_path_SETENV -if test -n "$SETENV"; then - { $as_echo "$as_me:$LINENO: result: $SETENV" >&5 -$as_echo "$SETENV" >&6; } +PERL=$ac_cv_path_PERL +if test -n "$PERL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +$as_echo "$PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "gtk-update-icon-path", so it can be a program name with args. -set dummy gtk-update-icon-path; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + if test "X$PERL" = "Xnotfound"; then + as_fn_error $? "You have requested a build +of the documentation. For this to work, you must have perl installed. +Alternatively, you can disable building the documentation with +--disable-doc. +" "$LINENO" 5 + fi + + + # Extract the first word of "kpsewhich", so it can be a program name with args. +set dummy kpsewhich; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN+set}" = set; then +if test "${ac_cv_path_KPSEWHICH+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $GTK_UPDATE_ICON_CACHE_BIN in + case $KPSEWHICH in [\\/]* | ?:[\\/]*) - ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN="$GTK_UPDATE_ICON_CACHE_BIN" # Let the user override the test with a path. + ac_cv_path_KPSEWHICH="$KPSEWHICH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -17595,212 +11433,215 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_KPSEWHICH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN" && ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN="true" + test -z "$ac_cv_path_KPSEWHICH" && ac_cv_path_KPSEWHICH="no" ;; esac fi -GTK_UPDATE_ICON_CACHE_BIN=$ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN -if test -n "$GTK_UPDATE_ICON_CACHE_BIN"; then - { $as_echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE_BIN" >&5 -$as_echo "$GTK_UPDATE_ICON_CACHE_BIN" >&6; } +KPSEWHICH=$ac_cv_path_KPSEWHICH +if test -n "$KPSEWHICH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KPSEWHICH" >&5 +$as_echo "$KPSEWHICH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + if test "X$KPSEWHICH" = "Xno"; then + as_fn_error $? "You have requested a build +of the documentation. For this to work, you must have a functional install of +TeX and LaTeX. kpsewhich is part of TeX. +Alternatively, you can disable building the documentation with +--disable-doc." "$LINENO" 5 + fi -# Change default location for XDG files (MIME and Icons) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking If your TeX installation contains epsf.tex" >&5 +$as_echo_n "checking If your TeX installation contains epsf.tex... " >&6; } + f=`$KPSEWHICH epsf.tex` + if test $? -eq 0 ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($f)" >&5 +$as_echo "yes ($f)" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "You have requested a build +of the documentation. For this to work, you must have a functional install of +TeX and LaTeX that includes epsf.tex. On some linux distributions this is +part of the texlive-generic-recommended package. +Alternatively, you can disable building the documentation with +--disable-doc." "$LINENO" 5 + fi -# Check whether --with-xdgdatadir was given. -if test "${with_xdgdatadir+set}" = set; then - withval=$with_xdgdatadir; opt_xdgdatadir=$withval fi +########################################################################## +# +# -# Change default location for KDE data files (KDE MIME registrations) - -# Check whether --with-kdedatadir was given. -if test "${with_kdedatadir+set}" = set; then - withval=$with_kdedatadir; opt_kdedatadir=$withval -fi +# FIXME: for now, only try to add -rdynamic if we're using gcc. We really +# need to figure out what the correct test is here. In the mean time, this +# should let things build with SunPRO again. +if test "x$GCC" = "xyes"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking If the compiler accepts -rdynamic" >&5 +$as_echo_n "checking If the compiler accepts -rdynamic... " >&6; } +old_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS -rdynamic" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -if test x$opt_xdgdatadir = x; then - # path was not specified with --with-xdgdatadir - XDGDATADIR='${datadir}' + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - # path WAS specified with --with-xdgdatadir - XDGDATADIR="$opt_xdgdatadir" + LDFLAGS="$old_LDFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +# ------------- HID config ------------------- -if test x$opt_kdedatadir = x; then - # path was not specified with --with-kdedatadir - KDEDATADIR='${datadir}' -else - # path WAS specified with --with-kdedatadir - KDEDATADIR="$opt_kdedatadir" -fi +hid_guis="" +hid_printers="" +hid_exporters="" +hid_always="" + +for hid in `cd $srcdir/src/hid; echo *`; do + F=$srcdir/src/hid/$hid/hid.conf + if test -f $F + then + echo checking $F + . $F + case $type in + gui ) hid_guis="$hid_guis $hid" ;; + printer ) hid_printers="$hid_printers $hid" ;; + export ) hid_exporters="$hid_exporters $hid" ;; + always ) hid_always="$hid_always $hid" ;; + esac + fi +done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for which gui to use" >&5 +$as_echo_n "checking for which gui to use... " >&6; } -# Check whether --enable-update-desktop-database was given. -if test "${enable_update_desktop_database+set}" = set; then - enableval=$enable_update_desktop_database; +# Check whether --with-gui was given. +if test "${with_gui+set}" = set; then : + withval=$with_gui; else - enable_update_desktop_database=yes + with_gui=gtk + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gui" >&5 +$as_echo "$with_gui" >&6; } +case " $hid_guis no none " in + *\ $with_gui\ * ) HIDLIST="$with_gui" ;; + * ) as_fn_error $? "$with_gui is not a valid gui" "$LINENO" 5 ;; +esac - if test x$enable_update_desktop_database = xyes; then - ENABLE_UPDATE_DESKTOP_DATABASE_TRUE= - ENABLE_UPDATE_DESKTOP_DATABASE_FALSE='#' -else - ENABLE_UPDATE_DESKTOP_DATABASE_TRUE='#' - ENABLE_UPDATE_DESKTOP_DATABASE_FALSE= +if test x"$with_gui" = x"none" -o x"$with_gui" = x"no" +then + HIDLIST= fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable toporouter" >&5 +$as_echo_n "checking whether to enable toporouter... " >&6; } +# Check whether --enable-toporouter was given. +if test "${enable_toporouter+set}" = set; then : + enableval=$enable_toporouter; +fi -if test x$enable_update_desktop_database = xyes ; then - # Extract the first word of "update-desktop-database", so it can be a program name with args. -set dummy update-desktop-database; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_UPDATE_DESKTOP_DATABASE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $UPDATE_DESKTOP_DATABASE in - [\\/]* | ?:[\\/]*) - ac_cv_path_UPDATE_DESKTOP_DATABASE="$UPDATE_DESKTOP_DATABASE" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_UPDATE_DESKTOP_DATABASE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +case "x$enable_toporouter" in #( + xyes | xno) : + ;; #( + *) : + enable_toporouter=yes - test -z "$ac_cv_path_UPDATE_DESKTOP_DATABASE" && ac_cv_path_UPDATE_DESKTOP_DATABASE="no" - ;; + ;; esac -fi -UPDATE_DESKTOP_DATABASE=$ac_cv_path_UPDATE_DESKTOP_DATABASE -if test -n "$UPDATE_DESKTOP_DATABASE"; then - { $as_echo "$as_me:$LINENO: result: $UPDATE_DESKTOP_DATABASE" >&5 -$as_echo "$UPDATE_DESKTOP_DATABASE" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_toporouter" >&5 +$as_echo "$enable_toporouter" >&6; } + if test $enable_toporouter != no; then + WITH_TOPOROUTER_TRUE= + WITH_TOPOROUTER_FALSE='#' else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + WITH_TOPOROUTER_TRUE='#' + WITH_TOPOROUTER_FALSE= fi - if test $UPDATE_DESKTOP_DATABASE = no; then - { { $as_echo "$as_me:$LINENO: error: Cannot find update-desktop-database, make sure it is installed and in your PATH, or configure with --disable-update-desktop-database" >&5 -$as_echo "$as_me: error: Cannot find update-desktop-database, make sure it is installed and in your PATH, or configure with --disable-update-desktop-database" >&2;} - { (exit 1); exit 1; }; } - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable toporouter output" >&5 +$as_echo_n "checking whether to enable toporouter output... " >&6; } +# Check whether --enable-toporouter-output was given. +if test "${enable_toporouter_output+set}" = set; then : + enableval=$enable_toporouter_output; fi -# Check whether --enable-update-mime-database was given. -if test "${enable_update_mime_database+set}" = set; then - enableval=$enable_update_mime_database; -else - enable_update_mime_database=yes -fi +case "z$enable_toporouter_output" in #( + zyes | zno) : + ;; #( + *) : + enable_toporouter_output=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_toporouter_output" >&5 +$as_echo "$enable_toporouter_output" >&6; } +case $enable_toporouter_output in #( + yes) : + topo_output_enabled=1 + ;; #( + *) : - if test x$enable_update_mime_database = xyes; then - ENABLE_UPDATE_MIME_DATABASE_TRUE= - ENABLE_UPDATE_MIME_DATABASE_FALSE='#' -else - ENABLE_UPDATE_MIME_DATABASE_TRUE='#' - ENABLE_UPDATE_MIME_DATABASE_FALSE= -fi + topo_output_enabled=0 + ;; +esac -if test x$enable_update_mime_database = xyes ; then - # Extract the first word of "update-mime-database", so it can be a program name with args. -set dummy update-mime-database; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_UPDATE_MIME_DATABASE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $UPDATE_MIME_DATABASE in - [\\/]* | ?:[\\/]*) - ac_cv_path_UPDATE_MIME_DATABASE="$UPDATE_MIME_DATABASE" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_UPDATE_MIME_DATABASE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +cat >>confdefs.h <<_ACEOF +#define TOPO_OUTPUT_ENABLED $topo_output_enabled +_ACEOF - test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no" - ;; -esac -fi -UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE -if test -n "$UPDATE_MIME_DATABASE"; then - { $as_echo "$as_me:$LINENO: result: $UPDATE_MIME_DATABASE" >&5 -$as_echo "$UPDATE_MIME_DATABASE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - if test $UPDATE_MIME_DATABASE = no; then - { { $as_echo "$as_me:$LINENO: error: Cannot find update-mime-database, make sure it is installed and in your PATH, or configure with --disable-update-mime-database" >&5 -$as_echo "$as_me: error: Cannot find update-mime-database, make sure it is installed and in your PATH, or configure with --disable-update-mime-database" >&2;} - { (exit 1); exit 1; }; } - fi -fi -# -###################################################################### -for ac_prog in gm4 m4 -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_M4+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $M4 in + case $PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_M4="$M4" # Let the user override the test with a path. + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -17808,73 +11649,42 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_M4="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; esac fi -M4=$ac_cv_path_M4 -if test -n "$M4"; then - { $as_echo "$as_me:$LINENO: result: $M4" >&5 -$as_echo "$M4" >&6; } +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$M4" && break -done -test -n "$M4" || M4="none" - -if test "X$M4" = "Xnone" ; then - { { $as_echo "$as_me:$LINENO: error: Did not find a m4 executible. You need to make sure - that m4 is installed on your system and that m4 is in your path" >&5 -$as_echo "$as_me: error: Did not find a m4 executible. You need to make sure - that m4 is installed on your system and that m4 is in your path" >&2;} - { (exit 1); exit 1; }; } -fi -{ $as_echo "$as_me:$LINENO: checking if $M4 has the division involving negative numbers bug" >&5 -$as_echo_n "checking if $M4 has the division involving negative numbers bug... " >&6; } -pcb_m4_r=`echo "eval(-2/2)" | $M4` -if test "$pcb_m4_r" != "-1" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { { $as_echo "$as_me:$LINENO: error: It appears that $M4 has a bug involving division -with negative numbers. In particular it just returned the result that --2/2 = $pcb_m4_r instead of -1. This is a known bug in GNU m4-1.4.9. Please -install a non-broken m4." >&5 -$as_echo "$as_me: error: It appears that $M4 has a bug involving division -with negative numbers. In particular it just returned the result that --2/2 = $pcb_m4_r instead of -1. This is a known bug in GNU m4-1.4.9. Please -install a non-broken m4." >&2;} - { (exit 1); exit 1; }; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi - - -for ac_prog in wish wish83 wish8.3 wish80 wish8.0 cygwish83 cygwish80 -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_WISH+set}" = set; then +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $WISH in + case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_WISH="$WISH" # Let the user override the test with a path. + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -17882,2908 +11692,2991 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; esac fi -WISH=$ac_cv_path_WISH -if test -n "$WISH"; then - { $as_echo "$as_me:$LINENO: result: $WISH" >&5 -$as_echo "$WISH" >&6; } +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + PKG_CONFIG="" + fi fi +if test "x$enable_toporouter_output" = "xyes"; then - test -n "$WISH" && break -done -test -n "$WISH" || WISH="none" +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 +$as_echo_n "checking for CAIRO... " >&6; } -if test "X$WISH" = "Xnone" ; then - { { $as_echo "$as_me:$LINENO: error: Did not find the wish executible. You need to make sure - that tcl is installed on your system and that wish is in your path" >&5 -$as_echo "$as_me: error: Did not find the wish executible. You need to make sure - that tcl is installed on your system and that wish is in your path" >&2;} - { (exit 1); exit 1; }; } +if test -n "$CAIRO_CFLAGS"; then + pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$CAIRO_LIBS"; then + pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -cat >>confdefs.h <<_ACEOF -#define M4 $M4 -_ACEOF -GNUM4=$M4 +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo" 2>&1` + else + CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$CAIRO_PKG_ERRORS" >&5 + as_fn_error $? "Cannot find cairo, needed by the toporouter +Please review the following errors: +$CAIRO_PKG_ERRORS" "$LINENO" 5 -cat >>confdefs.h <<_ACEOF -#define GNUM4 "$M4" -_ACEOF +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Cannot find cairo, needed by the toporouter +Please review the following errors: +$CAIRO_PKG_ERRORS" "$LINENO" 5 + +else + CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS + CAIRO_LIBS=$pkg_cv_CAIRO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +fi -# Extract the first word of "latex", so it can be a program name with args. -set dummy latex; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_LATEX+set}" = set; then - $as_echo_n "(cached) " >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether to use DBUS" >&5 +$as_echo_n "checking for whether to use DBUS... " >&6; } +# Check whether --enable-dbus was given. +if test "${enable_dbus+set}" = set; then : + enableval=$enable_dbus; else - case $LATEX in - [\\/]* | ?:[\\/]*) - ac_cv_path_LATEX="$LATEX" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_LATEX="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - test -z "$ac_cv_path_LATEX" && ac_cv_path_LATEX="notfound" - ;; -esac + case " $with_gui " in + *\ gtk\ *) enable_dbus=yes ;; + *\ lesstif\ *) enable_dbus=yes ;; + * ) enable_dbus=no ;; + esac + fi -LATEX=$ac_cv_path_LATEX -if test -n "$LATEX"; then - { $as_echo "$as_me:$LINENO: result: $LATEX" >&5 -$as_echo "$LATEX" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dbus" >&5 +$as_echo "$enable_dbus" >&6; } + if test x$enable_dbus = xyes; then + WITH_DBUS_TRUE= + WITH_DBUS_FALSE='#' else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + WITH_DBUS_TRUE='#' + WITH_DBUS_FALSE= fi - if test x$LATEX = xnotfound; then - MISSING_LATEX_TRUE= - MISSING_LATEX_FALSE='#' +if test "x$enable_dbus" = "xyes"; then + case " $with_gui " in + *\ gtk\ *) ;; + *\ lesstif\ *) ;; + * ) as_fn_error $? "DBUS enabled but only works with a mainloop capable GUI HID. +Either do not use --enable-dbus or enable the gtk or lesstif GUI HID." "$LINENO" 5 + esac + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 +$as_echo_n "checking for DBUS... " >&6; } + +if test -n "$DBUS_CFLAGS"; then + pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.61\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.61") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.61" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$DBUS_LIBS"; then + pkg_cv_DBUS_LIBS="$DBUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.61\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.61") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.61" 2>/dev/null` else - MISSING_LATEX_TRUE='#' - MISSING_LATEX_FALSE= + pkg_failed=yes +fi + else + pkg_failed=untried fi -# Extract the first word of "pdflatex", so it can be a program name with args. -set dummy pdflatex; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PDFLATEX+set}" = set; then - $as_echo_n "(cached) " >&6 + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - case $PDFLATEX in - [\\/]* | ?:[\\/]*) - ac_cv_path_PDFLATEX="$PDFLATEX" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PDFLATEX="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.61" 2>&1` + else + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.61" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DBUS_PKG_ERRORS" >&5 + + as_fn_error $? "Cannot find dbus-1 >= 0.61, install it and rerun ./configure +Please review the following errors: +$DBUS_PKG_ERRORS" "$LINENO" 5 + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Cannot find dbus-1 >= 0.61, install it and rerun ./configure +Please review the following errors: +$DBUS_PKG_ERRORS" "$LINENO" 5 - test -z "$ac_cv_path_PDFLATEX" && ac_cv_path_PDFLATEX="notfound" - ;; -esac -fi -PDFLATEX=$ac_cv_path_PDFLATEX -if test -n "$PDFLATEX"; then - { $as_echo "$as_me:$LINENO: result: $PDFLATEX" >&5 -$as_echo "$PDFLATEX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS + DBUS_LIBS=$pkg_cv_DBUS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + saved_LIBS="$LIBS" + LIBS="$LIBS $DBUS_LIBS" + for ac_func in dbus_watch_get_unix_fd +do : + ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd" "ac_cv_func_dbus_watch_get_unix_fd" +if test "x$ac_cv_func_dbus_watch_get_unix_fd" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DBUS_WATCH_GET_UNIX_FD 1 +_ACEOF + fi +done + + LIBS="$saved_LIBS" +fi + DBUS_VERSION=`$PKG_CONFIG dbus-1 --modversion` + + +$as_echo "#define HAVE_DBUS 1" >>confdefs.h - if test x$PDFLATEX = xnotfound; then - MISSING_PDFLATEX_TRUE= - MISSING_PDFLATEX_FALSE='#' -else - MISSING_PDFLATEX_TRUE='#' - MISSING_PDFLATEX_FALSE= fi -# Extract the first word of "dvips", so it can be a program name with args. -set dummy dvips; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DVIPS+set}" = set; then - $as_echo_n "(cached) " >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether to use GL drawing" >&5 +$as_echo_n "checking for whether to use GL drawing... " >&6; } +# Check whether --enable-gl was given. +if test "${enable_gl+set}" = set; then : + enableval=$enable_gl; else - case $DVIPS in - [\\/]* | ?:[\\/]*) - ac_cv_path_DVIPS="$DVIPS" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DVIPS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - test -z "$ac_cv_path_DVIPS" && ac_cv_path_DVIPS="notfound" - ;; -esac + case " $with_gui " in + *\ gtk\ *) enable_gl=yes;; + * ) enable_gl=no;; + esac + fi -DVIPS=$ac_cv_path_DVIPS -if test -n "$DVIPS"; then - { $as_echo "$as_me:$LINENO: result: $DVIPS" >&5 -$as_echo "$DVIPS" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gl" >&5 +$as_echo "$enable_gl" >&6; } + if test x$enable_gl = xyes; then + USE_GL_TRUE= + USE_GL_FALSE='#' else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + USE_GL_TRUE='#' + USE_GL_FALSE= fi - if test x$DVIPS = xnotfound; then - MISSING_DVIPS_TRUE= - MISSING_DVIPS_FALSE='#' -else - MISSING_DVIPS_TRUE='#' - MISSING_DVIPS_FALSE= -fi +if test "x$enable_gl" = "xyes"; then + case " $with_gui " in + *\ gtk\ *) ;; + * ) as_fn_error $? "GL drawing enabled but only works with the GTK HID. +Either do not use --enable-gl or enable the gtk HID." "$LINENO" 5 + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 +$as_echo_n "checking for X... " >&6; } -# Extract the first word of "texi2dvi", so it can be a program name with args. -set dummy texi2dvi; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_TEXI2DVI+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $TEXI2DVI in - [\\/]* | ?:[\\/]*) - ac_cv_path_TEXI2DVI="$TEXI2DVI" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_TEXI2DVI="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - test -z "$ac_cv_path_TEXI2DVI" && ac_cv_path_TEXI2DVI="notfound" - ;; -esac +# Check whether --with-x was given. +if test "${with_x+set}" = set; then : + withval=$with_x; fi -TEXI2DVI=$ac_cv_path_TEXI2DVI -if test -n "$TEXI2DVI"; then - { $as_echo "$as_me:$LINENO: result: $TEXI2DVI" >&5 -$as_echo "$TEXI2DVI" >&6; } + +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + case $x_includes,$x_libraries in #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no ac_x_libraries=no +rm -f -r conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + cat >Imakefile <<'_ACEOF' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' +_ACEOF + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl dylib la dll; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ac_x_includes= ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /usr/lib64 | /lib | /lib64) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -f -r conftest.dir fi +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R7/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/usr/include/X11 +/usr/include/X11R7 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 - if test x$TEXI2DVI = xnotfound; then - MISSING_TEXI2DVI_TRUE= - MISSING_TEXI2DVI_FALSE='#' -else - MISSING_TEXI2DVI_TRUE='#' - MISSING_TEXI2DVI_FALSE= -fi +/usr/local/X11/include +/usr/local/X11R7/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include +/usr/local/include/X11 +/usr/local/include/X11R7 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 -# Extract the first word of "ps2pdf", so it can be a program name with args. -set dummy ps2pdf; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PS2PDF+set}" = set; then - $as_echo_n "(cached) " >&6 +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' + +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # We can compile using X headers with no special include directory. +ac_x_includes= else - case $PS2PDF in - [\\/]* | ?:[\\/]*) - ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break fi done +fi +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no + +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIBS=$ac_save_LIBS +# We can link X programs with no special library path. +ac_x_libraries= +else + LIBS=$ac_save_LIBS +for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl dylib la dll; do + if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi + done done -IFS=$as_save_IFS +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = no - test -z "$ac_cv_path_PS2PDF" && ac_cv_path_PS2PDF="notfound" - ;; +case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) + # Didn't find X, or a directory has "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" esac fi -PS2PDF=$ac_cv_path_PS2PDF -if test -n "$PS2PDF"; then - { $as_echo "$as_me:$LINENO: result: $PS2PDF" >&5 -$as_echo "$PS2PDF" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - +;; #( + *) have_x=yes;; + esac + eval "$ac_cv_have_x" +fi # $with_x != no - if test x$PS2PDF = xnotfound; then - MISSING_PS2PDF_TRUE= - MISSING_PS2PDF_FALSE='#' +if test "$have_x" != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 +$as_echo "$have_x" >&6; } + no_x=yes else - MISSING_PS2PDF_TRUE='#' - MISSING_PS2PDF_FALSE= + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 +$as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi - -# used to build some of the getting started guide -# Extract the first word of "gschem", so it can be a program name with args. -set dummy gschem; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GSCHEM+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if test "${ac_cv_path_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $GSCHEM in - [\\/]* | ?:[\\/]*) - ac_cv_path_GSCHEM="$GSCHEM" # Let the user override the test with a path. - ;; - *) + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GSCHEM="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GSCHEM" && ac_cv_path_GSCHEM="notfound" - ;; + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac -fi -GSCHEM=$ac_cv_path_GSCHEM -if test -n "$GSCHEM"; then - { $as_echo "$as_me:$LINENO: result: $GSCHEM" >&5 -$as_echo "$GSCHEM" >&6; } + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_path_SED=$SED fi - - if test x$GSCHEM = xnotfound; then - MISSING_GSCHEM_TRUE= - MISSING_GSCHEM_FALSE='#' -else - MISSING_GSCHEM_TRUE='#' - MISSING_GSCHEM_FALSE= fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed -if test "X$docs_yesno" = "Xyes" -a "X$pcb_git_version" = "Xyes" ; then - if test "$LATEX" = "notfound" -o "$PDFLATEX" = "notfound" -o "$DVIPS" = "notfound" -o "$TEXI2DVI" = "notfound" -o "$PS2PDF" = "notfound" ; then - { { $as_echo "$as_me:$LINENO: error: It appears that you are building from a source tree obtained -via git but you do not have the required tools installed to build the documentation. Here -is a list of tools and the detected values: -LATEX: $LATEX -PDFLATEX: $PDFLATEX -DVIPS: $DVIPS -TEXI2DVI: $TEXI2DVI -PS2PDF: $PS2PDF -GSCHEM: $GSCHEM -Either make sure these tools are installed or disable building and installing the documentation -by using the --disable-doc configure option. -" >&5 -$as_echo "$as_me: error: It appears that you are building from a source tree obtained -via git but you do not have the required tools installed to build the documentation. Here -is a list of tools and the detected values: -LATEX: $LATEX -PDFLATEX: $PDFLATEX -DVIPS: $DVIPS -TEXI2DVI: $TEXI2DVI -PS2PDF: $PS2PDF -GSCHEM: $GSCHEM -Either make sure these tools are installed or disable building and installing the documentation -by using the --disable-doc configure option. -" >&2;} - { (exit 1); exit 1; }; } - fi -fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -############################################################################ -# -# These checks are for tools used by the testsuite. It will not be fatal -# if these are missing because this is primarily for developer use. It is -# possible that we might add some --enable flag in the future that forces -# full tools for development work. +ax_pthread_ok=no -# Check for ImageMagick tools used by the testsuite -# Extract the first word of "animate", so it can be a program name with args. -set dummy animate; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_IM_ANIMATE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $IM_ANIMATE in - [\\/]* | ?:[\\/]*) - ac_cv_path_IM_ANIMATE="$IM_ANIMATE" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_IM_ANIMATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - test -z "$ac_cv_path_IM_ANIMATE" && ac_cv_path_IM_ANIMATE="notfound" - ;; -esac +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_join (); +int +main () +{ +return pthread_join (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_pthread_ok=yes fi -IM_ANIMATE=$ac_cv_path_IM_ANIMATE -if test -n "$IM_ANIMATE"; then - { $as_echo "$as_me:$LINENO: result: $IM_ANIMATE" >&5 -$as_echo "$IM_ANIMATE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +$as_echo "$ax_pthread_ok" >&6; } + if test x"$ax_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" fi +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case "${host_cpu}-${host_os}" in + *solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: -# Extract the first word of "compare", so it can be a program name with args. -set dummy compare; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" + ;; +esac + +if test x"$ax_pthread_ok" = xno; then +for flag in $ax_pthread_flags; do + + case $flag in + none) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +$as_echo_n "checking whether pthreads work without any flags... " >&6; } + ;; + + -*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +$as_echo_n "checking whether pthreads work with $flag... " >&6; } + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + # Extract the first word of "pthread-config", so it can be a program name with args. +set dummy pthread-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_IM_COMPARE+set}" = set; then +if test "${ac_cv_prog_ax_pthread_config+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $IM_COMPARE in - [\\/]* | ?:[\\/]*) - ac_cv_path_IM_COMPARE="$IM_COMPARE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$ax_pthread_config"; then + ac_cv_prog_ax_pthread_config="$ax_pthread_config" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_IM_COMPARE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ax_pthread_config="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - test -z "$ac_cv_path_IM_COMPARE" && ac_cv_path_IM_COMPARE="notfound" - ;; -esac + test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no" fi -IM_COMPARE=$ac_cv_path_IM_COMPARE -if test -n "$IM_COMPARE"; then - { $as_echo "$as_me:$LINENO: result: $IM_COMPARE" >&5 -$as_echo "$IM_COMPARE" >&6; } +fi +ax_pthread_config=$ac_cv_prog_ax_pthread_config +if test -n "$ax_pthread_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 +$as_echo "$ax_pthread_config" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "composite", so it can be a program name with args. -set dummy composite; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_IM_COMPOSITE+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $IM_COMPOSITE in - [\\/]* | ?:[\\/]*) - ac_cv_path_IM_COMPOSITE="$IM_COMPOSITE" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_IM_COMPOSITE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + if test x"$ax_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; - test -z "$ac_cv_path_IM_COMPOSITE" && ac_cv_path_IM_COMPOSITE="notfound" - ;; -esac + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; } + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + static void routine(void* a) {a=0;} + static void* start_routine(void* a) {return a;} +int +main () +{ +pthread_t th; pthread_attr_t attr; + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_create(&th,0,start_routine,0); + pthread_cleanup_pop(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_pthread_ok=yes fi -IM_COMPOSITE=$ac_cv_path_IM_COMPOSITE -if test -n "$IM_COMPOSITE"; then - { $as_echo "$as_me:$LINENO: result: $IM_COMPOSITE" >&5 -$as_echo "$IM_COMPOSITE" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +$as_echo "$ax_pthread_ok" >&6; } + if test "x$ax_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done fi +# Various other checks: +if test "x$ax_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +$as_echo_n "checking for joinable pthread attribute... " >&6; } + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int attr=$attr; return attr; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + attr_name=$attr; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 +$as_echo "$attr_name" >&6; } + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + +cat >>confdefs.h <<_ACEOF +#define PTHREAD_CREATE_JOINABLE $attr_name +_ACEOF + + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; } + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +$as_echo "${flag}" >&6; } + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi -# Extract the first word of "convert", so it can be a program name with args. -set dummy convert; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + for ac_prog in xlc_r cc_r +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_IM_CONVERT+set}" = set; then +if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $IM_CONVERT in - [\\/]* | ?:[\\/]*) - ac_cv_path_IM_CONVERT="$IM_CONVERT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$PTHREAD_CC"; then + ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # 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 + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_IM_CONVERT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_PTHREAD_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS - test -z "$ac_cv_path_IM_CONVERT" && ac_cv_path_IM_CONVERT="notfound" - ;; -esac fi -IM_CONVERT=$ac_cv_path_IM_CONVERT -if test -n "$IM_CONVERT"; then - { $as_echo "$as_me:$LINENO: result: $IM_CONVERT" >&5 -$as_echo "$IM_CONVERT" >&6; } +fi +PTHREAD_CC=$ac_cv_prog_PTHREAD_CC +if test -n "$PTHREAD_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +$as_echo "$PTHREAD_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of "display", so it can be a program name with args. -set dummy display; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_IM_DISPLAY+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $IM_DISPLAY in - [\\/]* | ?:[\\/]*) - ac_cv_path_IM_DISPLAY="$IM_DISPLAY" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_IM_DISPLAY="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + test -n "$PTHREAD_CC" && break done -IFS=$as_save_IFS +test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" - test -z "$ac_cv_path_IM_DISPLAY" && ac_cv_path_IM_DISPLAY="notfound" - ;; -esac + else + PTHREAD_CC=$CC + fi +else + PTHREAD_CC="$CC" fi -IM_DISPLAY=$ac_cv_path_IM_DISPLAY -if test -n "$IM_DISPLAY"; then - { $as_echo "$as_me:$LINENO: result: $IM_DISPLAY" >&5 -$as_echo "$IM_DISPLAY" >&6; } + + + + + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$ax_pthread_ok" = xyes; then + +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h + + : else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + ax_pthread_ok=no + fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Extract the first word of "montage", so it can be a program name with args. -set dummy montage; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_IM_MONTAGE+set}" = set; then + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Microsoft C compiler" >&5 +$as_echo_n "checking whether we are using the Microsoft C compiler... " >&6; } +if test "${ax_cv_c_compiler_ms+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $IM_MONTAGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_IM_MONTAGE="$IM_MONTAGE" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_IM_MONTAGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef _MSC_VER + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ax_compiler_ms=yes +else + ax_compiler_ms=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ax_cv_c_compiler_ms=$ax_compiler_ms + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_ms" >&5 +$as_echo "$ax_cv_c_compiler_ms" >&6; } +if test X$ax_compiler_ms = Xno; then : + GL_CFLAGS="${PTHREAD_CFLAGS}"; GL_LIBS="${PTHREAD_LIBS}" +fi + +# +# Use x_includes and x_libraries if they have been set (presumably by +# AC_PATH_X). +# +if test X$no_x != Xyes -a -n "$x_includes"; then : + GL_CFLAGS="-I$x_includes $GL_CFLAGS" +fi + +for ac_header in windows.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINDOWS_H 1 +_ACEOF + +fi + done + + +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GL_CFLAGS $CPPFLAGS" +for ac_header in GL/gl.h OpenGL/gl.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif + +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -IFS=$as_save_IFS - test -z "$ac_cv_path_IM_MONTAGE" && ac_cv_path_IM_MONTAGE="notfound" - ;; +CPPFLAGS=$ax_save_CPPFLAGS + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL library" >&5 +$as_echo_n "checking for OpenGL library... " >&6; } +if test "${ax_cv_check_gl_libgl+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ax_cv_check_gl_libgl=no +case $host_cpu in + x86_64) ax_check_gl_libdir=lib64 ;; + *) ax_check_gl_libdir=lib ;; esac +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $GL_CFLAGS" +ax_save_LDFLAGS=$LDFLAGS +if test X$no_x != Xyes -a -n "$x_libraries"; then : + LDFLAGS="$LDFLAGS -L$x_libraries" fi -IM_MONTAGE=$ac_cv_path_IM_MONTAGE -if test -n "$IM_MONTAGE"; then - { $as_echo "$as_me:$LINENO: result: $IM_MONTAGE" >&5 -$as_echo "$IM_MONTAGE" >&6; } +ax_save_LIBS=$LIBS +ax_check_libs="-lopengl32 -lGL" +for ax_lib in $ax_check_libs; do + if test X$ax_compiler_ms = Xyes; then : + ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'` else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + ax_try_lib=$ax_lib fi + LDFLAGS="$ax_save_LDFLAGS $GL_LIBS" + LIBS="$ax_try_lib $ax_save_LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GL_H +# include +# elif defined(HAVE_OPENGL_GL_H) +# include +# else +# error no gl.h +# endif +int +main () +{ +glBegin(0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_check_gl_libgl=$ax_try_lib; break +else + ax_check_gl_nvidia_flags="-L/usr/$ax_check_gl_libdir/nvidia" + LDFLAGS="$ax_save_LDFLAGS $GL_LIBS $ax_check_gl_nvidia_flags" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -missing_magick="" -test "${IM_ANIMATE}" != "notfound" || missing_magick="${missing_magick} animate" -test "${IM_COMPARE}" != "notfound" || missing_magick="${missing_magick} compare" -test "${IM_COMPOSITE}" != "notfound" || missing_magick="${missing_magick} composite" -test "${IM_CONVERT}" != "notfound" || missing_magick="${missing_magick} convert" -test "${IM_DISPLAY}" != "notfound" || missing_magick="${missing_magick} display" -test "${IM_MONTAGE}" != "notfound" || missing_magick="${missing_magick} montage" - -{ $as_echo "$as_me:$LINENO: checking if all ImageMagick tools needed for the testsuite were found" >&5 -$as_echo_n "checking if all ImageMagick tools needed for the testsuite were found... " >&6; } -if test "X${missing_magick}" != "X" ; then - { $as_echo "$as_me:$LINENO: result: no. The testsuite will be disabled because the following -tools from the ImageMagick suite were not found: -${missing_magick} -No loss in pcb functionality should be experienced, you just will not -be able to run the full regression testsuite. -" >&5 -$as_echo "no. The testsuite will be disabled because the following -tools from the ImageMagick suite were not found: -${missing_magick} -No loss in pcb functionality should be experienced, you just will not -be able to run the full regression testsuite. -" >&6; } - have_magick=no +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GL_H +# include +# elif defined(HAVE_OPENGL_GL_H) +# include +# else +# error no gl.h +# endif +int +main () +{ +glBegin(0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_check_gl_libgl="$ax_check_gl_nvidia_flags $ax_try_lib"; break else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - have_magick=yes + ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' + LDFLAGS="$ax_save_LDFLAGS $GL_LIBS $ax_check_gl_dylib_flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GL_H +# include +# elif defined(HAVE_OPENGL_GL_H) +# include +# else +# error no gl.h +# endif +int +main () +{ +glBegin(0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_check_gl_libgl="$ax_check_gl_dylib_flag $ax_try_lib"; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +done -have_test_tools=yes +# +# If no_x is "yes", we don't want to wind up using a libGL that is +# linked with X11. Test to see if the found libGL includes GLX +# functions. If it does and no_x is "yes", we want to reset +# ax_cv_check_gl_libgl back to "no". +# +# Note that LDFLAGS and LIBS should still have whatever values they +# had when we broke out of the test loop above; use that. +# +if test "X$ax_cv_check_gl_libgl" != Xno; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -test $have_magick = yes || have_test_tools=no +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GL_H +# include +# elif defined(HAVE_OPENGL_GL_H) +# include +# else +# error no gl.h +# endif +int +main () +{ +glXQueryVersion(0, 0, 0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if test X$no_x = Xyes; then : + ax_cv_check_gl_libgl=no +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi -# the RS274-X export HID is partially checked by looking at the result with -# gerbv -# Extract the first word of "gerbv", so it can be a program name with args. -set dummy gerbv; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GERBV+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $GERBV in - [\\/]* | ?:[\\/]*) - ac_cv_path_GERBV="$GERBV" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GERBV="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +LIBS=$ax_save_LIBS +if test "X$ax_cv_check_gl_libgl" = Xno -a X$no_x = Xyes; then : + LDFLAGS="$ax_save_LDFLAGS -framework OpenGL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - test -z "$ac_cv_path_GERBV" && ac_cv_path_GERBV="notfound" - ;; -esac +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GL_H +# include +# elif defined(HAVE_OPENGL_GL_H) +# include +# else +# error no gl.h +# endif +int +main () +{ +glBegin(0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_check_gl_libgl='-framework OpenGL' fi -GERBV=$ac_cv_path_GERBV -if test -n "$GERBV"; then - { $as_echo "$as_me:$LINENO: result: $GERBV" >&5 -$as_echo "$GERBV" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + +LDFLAGS=$ax_save_LDFLAGS +CPPFLAGS=$ax_save_CPPFLAGS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_gl_libgl" >&5 +$as_echo "$ax_cv_check_gl_libgl" >&6; } + +if test "X$ax_cv_check_gl_libgl" = Xno; then : + no_gl=yes; GL_CFLAGS=""; GL_LIBS="" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + GL_LIBS="$ax_cv_check_gl_libgl $GL_LIBS" fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -test $GERBV != notfound || have_test_tools=no - if test x$have_test_tools = xyes; then - HAVE_TEST_TOOLS_TRUE= - HAVE_TEST_TOOLS_FALSE='#' -else - HAVE_TEST_TOOLS_TRUE='#' - HAVE_TEST_TOOLS_FALSE= + + if test X$no_gl = Xyes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "OpenGL is required. +See \`config.log' for more details" "$LINENO" 5; } fi -{ $as_echo "$as_me:$LINENO: checking if all the requried testsuite tools were found" >&5 -$as_echo_n "checking if all the requried testsuite tools were found... " >&6; } -if test x$have_test_tools = xyes ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no -- the testsuite will be disabled" >&5 -$as_echo "no -- the testsuite will be disabled" >&6; } + +GLU_CFLAGS=$GL_CFLAGS + +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GL_CFLAGS $CPPFLAGS" +for ac_header in GL/glu.h OpenGL/glu.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif + +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + fi +done -# -############################################################################ +CPPFLAGS=$ax_save_CPPFLAGS -{ $as_echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 -$as_echo_n "checking for sqrt in -lm... " >&6; } -if test "${ac_cv_lib_m_sqrt+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL Utility library" >&5 +$as_echo_n "checking for OpenGL Utility library... " >&6; } +if test "${ax_cv_check_glu_libglu+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ax_cv_check_glu_libglu=no +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GL_CFLAGS $CPPFLAGS" +ax_save_LDFLAGS=$LDFLAGS +ax_save_LIBS=$LIBS + +# +# First, check for the possibility that everything we need is already in +# GL_LIBS. +# +LDFLAGS="$ax_save_LDFLAGS $GL_LIBS" +# +# libGLU typically links with libstdc++ on POSIX platforms. +# However, setting the language to C++ means that test program +# source is named "conftest.cc"; and Microsoft cl doesn't know what +# to do with such a file. +# +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +if test X$ax_compiler_ms = Xyes; then : + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sqrt (); +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GLU_H +# include +# elif defined(HAVE_OPENGL_GLU_H) +# include +# else +# error no glu.h +# endif int main () { -return sqrt (); +gluBeginCurve(0) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_m_sqrt=yes +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_check_glu_libglu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + LIBS="" + ax_check_libs="-lglu32 -lGLU" + for ax_lib in ${ax_check_libs}; do + if test X$ax_compiler_ms = Xyes; then : + ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'` +else + ax_try_lib=$ax_lib +fi + LIBS="$ax_try_lib $ax_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ac_cv_lib_m_sqrt=no +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GLU_H +# include +# elif defined(HAVE_OPENGL_GLU_H) +# include +# else +# error no glu.h +# endif +int +main () +{ +gluBeginCurve(0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_check_glu_libglu=$ax_try_lib; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test X$ax_compiler_ms = Xyes; then : + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 -$as_echo "$ac_cv_lib_m_sqrt" >&6; } -if test "x$ac_cv_lib_m_sqrt" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - LIBS="-lm $LIBS" +LIBS=$ax_save_LIBS +LDFLAGS=$ax_save_LDFLAGS +CPPFLAGS=$ax_save_CPPFLAGS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_glu_libglu" >&5 +$as_echo "$ax_cv_check_glu_libglu" >&6; } +if test "X$ax_cv_check_glu_libglu" = Xno; then : + no_glu=yes; GLU_CFLAGS=""; GLU_LIBS="" +else + if test "X$ax_cv_check_glu_libglu" = Xyes; then : + GLU_LIBS="" +else + GLU_LIBS="$ax_cv_check_glu_libglu" +fi fi -{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + +# +# Some versions of Mac OS X include a broken interpretation of the GLU +# tesselation callback function signature when using the C++ compiler. +# +if test "X$ax_cv_check_glu_libglu" != Xno; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for varargs GLU tesselator callback function type" >&5 +$as_echo_n "checking for varargs GLU tesselator callback function type... " >&6; } +if test "${ax_cv_varargs_glu_tesscb+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + ax_cv_varargs_glu_tesscb=no + ax_save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$GL_CFLAGS $CXXFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); +# ifdef HAVE_GL_GLU_H +# include +# else +# include +# endif int main () { -return dlopen (); +GLvoid (*func)(...); gluTessCallback(0, 0, func) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dl_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_varargs_glu_tesscb=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXXFLAGS=$ax_save_CXXFLAGS + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_cv_lib_dl_dlopen=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_varargs_glu_tesscb" >&5 +$as_echo "$ax_cv_varargs_glu_tesscb" >&6; } + if test X$ax_cv_varargs_glu_tesscb = Xyes; then : + +$as_echo "#define HAVE_VARARGS_GLU_TESSCB 1" >>confdefs.h -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDL 1 -_ACEOF +fi - LIBS="-ldl $LIBS" + if test X$no_glu = Xyes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The OpenGL GLU library is required. +See \`config.log' for more details" "$LINENO" 5; } +fi + + +$as_echo "#define ENABLE_GL 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for which printer to use" >&5 +$as_echo_n "checking for which printer to use... " >&6; } -{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lxnet" >&5 -$as_echo_n "checking for gethostbyname in -lxnet... " >&6; } -if test "${ac_cv_lib_xnet_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 +# Check whether --with-printer was given. +if test "${with_printer+set}" = set; then : + withval=$with_printer; else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lxnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + with_printer=lpr +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_printer" >&5 +$as_echo "$with_printer" >&6; } +case " $hid_printers " in + *\ $with_printer\ * ) + HIDLIST="$HIDLIST $with_printer" + ;; + * ) as_fn_error $? "$with_printer is not a valid printer" "$LINENO" 5 ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_xnet_gethostbyname=yes + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for which exporters to use" >&5 +$as_echo_n "checking for which exporters to use... " >&6; } + +# Check whether --with-exporters was given. +if test "${with_exporters+set}" = set; then : + withval=$with_exporters; else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + with_exporters=$hid_exporters +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_exporters" >&5 +$as_echo "$with_exporters" >&6; } +for e in `echo $with_exporters | sed 's/,/ /g'`; do + case " $hid_exporters " in + *\ $e\ * ) + HIDLIST="$HIDLIST $e" + ;; + * ) as_fn_error $? "$e is not a valid exporter" "$LINENO" 5 ;; + esac +done + +if test "X$enable_jpeg" = "Xno" -a "X$enable_gif" = "Xno" -a "X$enable_png" = "Xno" ; then + case " ${HIDLIST} " in + *\ png\ *) + as_fn_error $? "you have requested the png HID but turned off all output +formats! If you do not want gif/jpeg/png output, use --with-exporters to list +which exporters you want and do not list png there." "$LINENO" 5 + ;; + + *) + ;; + esac +fi + +for hid in $HIDLIST; do + F=$srcdir/src/hid/$hid/hid.conf + if test -f $F ; then + echo checking $hid depedencies + deps= + . $F + for dep in $deps; do + if test "X`echo $HIDLIST | grep $dep`" = "X"; then + as_fn_error $? "you have requested the $hid HID but not the $dep HID, which it depends on" "$LINENO" 5 + fi + done + fi +done + +for e in $HIDLIST; do + HIDLIBS="$HIDLIBS lib$e.a" +done - ac_cv_lib_xnet_gethostbyname=no -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xnet_gethostbyname" >&5 -$as_echo "$ac_cv_lib_xnet_gethostbyname" >&6; } -if test "x$ac_cv_lib_xnet_gethostbyname" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBXNET 1 -_ACEOF - LIBS="-lxnet $LIBS" -fi +# ------------- end HID config ------------------- +###################################################################### +# +# desktop integration +# -{ $as_echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5 -$as_echo_n "checking for yywrap in -lfl... " >&6; } -if test "${ac_cv_lib_fl_yywrap+set}" = set; then +# Extract the first word of "env", so it can be a program name with args. +set dummy env; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_SETENV+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + case $SETENV in + [\\/]* | ?:[\\/]*) + ac_cv_path_SETENV="$SETENV" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SETENV="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char yywrap (); -int -main () -{ -return yywrap (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_fl_yywrap=yes +fi +SETENV=$ac_cv_path_SETENV +if test -n "$SETENV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETENV" >&5 +$as_echo "$SETENV" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_fl_yywrap=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5 -$as_echo "$ac_cv_lib_fl_yywrap" >&6; } -if test "x$ac_cv_lib_fl_yywrap" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBFL 1 -_ACEOF - LIBS="-lfl $LIBS" +# Extract the first word of "gtk-update-icon-path", so it can be a program name with args. +set dummy gtk-update-icon-path; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $GTK_UPDATE_ICON_CACHE_BIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN="$GTK_UPDATE_ICON_CACHE_BIN" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN" && ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN="true" + ;; +esac fi - - -for ac_func in strerror -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 +GTK_UPDATE_ICON_CACHE_BIN=$ac_cv_path_GTK_UPDATE_ICON_CACHE_BIN +if test -n "$GTK_UPDATE_ICON_CACHE_BIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE_BIN" >&5 +$as_echo "$GTK_UPDATE_ICON_CACHE_BIN" >&6; } else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func +# Change default location for XDG files (MIME and Icons) -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +# Check whether --with-xdgdatadir was given. +if test "${with_xdgdatadir+set}" = set; then : + withval=$with_xdgdatadir; opt_xdgdatadir=$withval +fi -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi +# Change default location for KDE data files (KDE MIME registrations) -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +# Check whether --with-kdedatadir was given. +if test "${with_kdedatadir+set}" = set; then : + withval=$with_kdedatadir; opt_kdedatadir=$withval fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done +if test x$opt_xdgdatadir = x; then + # path was not specified with --with-xdgdatadir + XDGDATADIR='${datadir}' +else + # path WAS specified with --with-xdgdatadir + XDGDATADIR="$opt_xdgdatadir" +fi -for ac_func in regcomp re_comp -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 +if test x$opt_kdedatadir = x; then + # path was not specified with --with-kdedatadir + KDEDATADIR='${datadir}' else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + # path WAS specified with --with-kdedatadir + KDEDATADIR="$opt_kdedatadir" +fi -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif +# Check whether --enable-update-desktop-database was given. +if test "${enable_update_desktop_database+set}" = set; then : + enableval=$enable_update_desktop_database; +else + enable_update_desktop_database=yes +fi -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif + if test x$enable_update_desktop_database = xyes; then + ENABLE_UPDATE_DESKTOP_DATABASE_TRUE= + ENABLE_UPDATE_DESKTOP_DATABASE_FALSE='#' +else + ENABLE_UPDATE_DESKTOP_DATABASE_TRUE='#' + ENABLE_UPDATE_DESKTOP_DATABASE_FALSE= +fi -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + +if test x$enable_update_desktop_database = xyes ; then + # Extract the first word of "update-desktop-database", so it can be a program name with args. +set dummy update-desktop-database; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_UPDATE_DESKTOP_DATABASE+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $UPDATE_DESKTOP_DATABASE in + [\\/]* | ?:[\\/]*) + ac_cv_path_UPDATE_DESKTOP_DATABASE="$UPDATE_DESKTOP_DATABASE" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_UPDATE_DESKTOP_DATABASE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_UPDATE_DESKTOP_DATABASE" && ac_cv_path_UPDATE_DESKTOP_DATABASE="no" + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +fi +UPDATE_DESKTOP_DATABASE=$ac_cv_path_UPDATE_DESKTOP_DATABASE +if test -n "$UPDATE_DESKTOP_DATABASE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UPDATE_DESKTOP_DATABASE" >&5 +$as_echo "$UPDATE_DESKTOP_DATABASE" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + + if test $UPDATE_DESKTOP_DATABASE = no; then + as_fn_error $? "Cannot find update-desktop-database, make sure it is installed and in your PATH, or configure with --disable-update-desktop-database" "$LINENO" 5 + fi fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +# Check whether --enable-update-mime-database was given. +if test "${enable_update_mime_database+set}" = set; then : + enableval=$enable_update_mime_database; +else + enable_update_mime_database=yes fi -done + if test x$enable_update_mime_database = xyes; then + ENABLE_UPDATE_MIME_DATABASE_TRUE= + ENABLE_UPDATE_MIME_DATABASE_FALSE='#' +else + ENABLE_UPDATE_MIME_DATABASE_TRUE='#' + ENABLE_UPDATE_MIME_DATABASE_FALSE= +fi -for ac_func in logf expf rint -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +if test x$enable_update_mime_database = xyes ; then + # Extract the first word of "update-mime-database", so it can be a program name with args. +set dummy update-mime-database; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_UPDATE_MIME_DATABASE+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif + case $UPDATE_MIME_DATABASE in + [\\/]* | ?:[\\/]*) + ac_cv_path_UPDATE_MIME_DATABASE="$UPDATE_MIME_DATABASE" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_UPDATE_MIME_DATABASE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no" + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +fi +UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE +if test -n "$UPDATE_MIME_DATABASE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UPDATE_MIME_DATABASE" >&5 +$as_echo "$UPDATE_MIME_DATABASE" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + if test $UPDATE_MIME_DATABASE = no; then + as_fn_error $? "Cannot find update-mime-database, make sure it is installed and in your PATH, or configure with --disable-update-mime-database" "$LINENO" 5 + fi fi -done +# +###################################################################### -for ac_func in vsnprintf +for ac_prog in gm4 m4 do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_M4+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + case $M4 in + [\\/]* | ?:[\\/]*) + ac_cv_path_M4="$M4" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_M4="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + ;; +esac +fi +M4=$ac_cv_path_M4 +if test -n "$M4"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $M4" >&5 +$as_echo "$M4" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func + test -n "$M4" && break +done +test -n "$M4" || M4="none" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +if test "X$M4" = "Xnone" ; then + as_fn_error $? "Did not find a m4 executible. You need to make sure + that m4 is installed on your system and that m4 is in your path" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $M4 has the division involving negative numbers bug" >&5 +$as_echo_n "checking if $M4 has the division involving negative numbers bug... " >&6; } +pcb_m4_r=`echo "eval(-2/2)" | $M4` +if test "$pcb_m4_r" != "-1" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + as_fn_error $? "It appears that $M4 has a bug involving division +with negative numbers. In particular it just returned the result that +-2/2 = $pcb_m4_r instead of -1. This is a known bug in GNU m4-1.4.9. Please +install a non-broken m4." "$LINENO" 5 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" + +for ac_prog in wish wish85 wish8.5 wish83 wish8.3 wish80 wish8.0 cygwish83 cygwish80 +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_WISH+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + case $WISH in + [\\/]* | ?:[\\/]*) + ac_cv_path_WISH="$WISH" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - eval "$as_ac_var=no" + ;; +esac fi +WISH=$ac_cv_path_WISH +if test -n "$WISH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WISH" >&5 +$as_echo "$WISH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$WISH" && break +done +test -n "$WISH" || WISH="none" -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +if test "X$WISH" = "Xnone" ; then + as_fn_error $? "Did not find the wish executible. You need to make sure + that tcl is installed on your system and that wish is in your path" "$LINENO" 5 fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + + +cat >>confdefs.h <<_ACEOF +#define M4 $M4 _ACEOF -fi -done +GNUM4=$M4 +cat >>confdefs.h <<_ACEOF +#define GNUM4 "$M4" +_ACEOF -for ac_func in getpwuid gethostname getcwd -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +# Extract the first word of "pdflatex", so it can be a program name with args. +set dummy pdflatex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PDFLATEX+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + case $PDFLATEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_PDFLATEX="$PDFLATEX" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PDFLATEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + test -z "$ac_cv_path_PDFLATEX" && ac_cv_path_PDFLATEX="notfound" + ;; +esac +fi +PDFLATEX=$ac_cv_path_PDFLATEX +if test -n "$PDFLATEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDFLATEX" >&5 +$as_echo "$PDFLATEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func + if test x$PDFLATEX = xnotfound; then + MISSING_PDFLATEX_TRUE= + MISSING_PDFLATEX_FALSE='#' +else + MISSING_PDFLATEX_TRUE='#' + MISSING_PDFLATEX_FALSE= +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +# Extract the first word of "texi2dvi", so it can be a program name with args. +set dummy texi2dvi; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_TEXI2DVI+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + case $TEXI2DVI in + [\\/]* | ?:[\\/]*) + ac_cv_path_TEXI2DVI="$TEXI2DVI" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_TEXI2DVI="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - eval "$as_ac_var=no" + test -z "$ac_cv_path_TEXI2DVI" && ac_cv_path_TEXI2DVI="notfound" + ;; +esac fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +TEXI2DVI=$ac_cv_path_TEXI2DVI +if test -n "$TEXI2DVI"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEXI2DVI" >&5 +$as_echo "$TEXI2DVI" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + + if test x$TEXI2DVI = xnotfound; then + MISSING_TEXI2DVI_TRUE= + MISSING_TEXI2DVI_FALSE='#' +else + MISSING_TEXI2DVI_TRUE='#' + MISSING_TEXI2DVI_FALSE= fi -done -for ac_func in random -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +# Extract the first word of "ps2pdf", so it can be a program name with args. +set dummy ps2pdf; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PS2PDF+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + case $PS2PDF in + [\\/]* | ?:[\\/]*) + ac_cv_path_PS2PDF="$PS2PDF" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + test -z "$ac_cv_path_PS2PDF" && ac_cv_path_PS2PDF="notfound" + ;; +esac +fi +PS2PDF=$ac_cv_path_PS2PDF +if test -n "$PS2PDF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS2PDF" >&5 +$as_echo "$PS2PDF" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func + if test x$PS2PDF = xnotfound; then + MISSING_PS2PDF_TRUE= + MISSING_PS2PDF_FALSE='#' +else + MISSING_PS2PDF_TRUE='#' + MISSING_PS2PDF_FALSE= +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +# used to build some of the getting started guide +# Extract the first word of "gschem", so it can be a program name with args. +set dummy gschem; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GSCHEM+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + case $GSCHEM in + [\\/]* | ?:[\\/]*) + ac_cv_path_GSCHEM="$GSCHEM" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GSCHEM="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - eval "$as_ac_var=no" + test -z "$ac_cv_path_GSCHEM" && ac_cv_path_GSCHEM="notfound" + ;; +esac +fi +GSCHEM=$ac_cv_path_GSCHEM +if test -n "$GSCHEM"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSCHEM" >&5 +$as_echo "$GSCHEM" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + + if test x$GSCHEM = xnotfound; then + MISSING_GSCHEM_TRUE= + MISSING_GSCHEM_FALSE='#' +else + MISSING_GSCHEM_TRUE='#' + MISSING_GSCHEM_FALSE= fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + +if test "X$docs_yesno" = "Xyes" -a "X$pcb_git_version" = "Xyes" ; then + if test "$PDFLATEX" = "notfound" -o "$TEXI2DVI" = "notfound" -o "$PS2PDF" = "notfound" ; then + as_fn_error $? "It appears that you are building from a source tree obtained +via git but you do not have the required tools installed to build the documentation. Here +is a list of tools and the detected values: +PDFLATEX: $PDFLATEX +TEXI2DVI: $TEXI2DVI +PS2PDF: $PS2PDF +GSCHEM: $GSCHEM + +Either make sure these tools are installed or disable building and installing the documentation +by using the --disable-doc configure option. +" "$LINENO" 5 + fi fi -done +############################################################################ +# +# These checks are for tools used by the testsuite. It will not be fatal +# if these are missing because this is primarily for developer use. It is +# possible that we might add some --enable flag in the future that forces +# full tools for development work. -for ac_func in stat -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +# Check for ImageMagick tools used by the testsuite +# Extract the first word of "animate", so it can be a program name with args. +set dummy animate; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_IM_ANIMATE+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif + case $IM_ANIMATE in + [\\/]* | ?:[\\/]*) + ac_cv_path_IM_ANIMATE="$IM_ANIMATE" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_IM_ANIMATE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + test -z "$ac_cv_path_IM_ANIMATE" && ac_cv_path_IM_ANIMATE="notfound" + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +fi +IM_ANIMATE=$ac_cv_path_IM_ANIMATE +if test -n "$IM_ANIMATE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IM_ANIMATE" >&5 +$as_echo "$IM_ANIMATE" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi +# Extract the first word of "compare", so it can be a program name with args. +set dummy compare; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_IM_COMPARE+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $IM_COMPARE in + [\\/]* | ?:[\\/]*) + ac_cv_path_IM_COMPARE="$IM_COMPARE" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_IM_COMPARE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS + test -z "$ac_cv_path_IM_COMPARE" && ac_cv_path_IM_COMPARE="notfound" + ;; +esac +fi +IM_COMPARE=$ac_cv_path_IM_COMPARE +if test -n "$IM_COMPARE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IM_COMPARE" >&5 +$as_echo "$IM_COMPARE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -for ac_func in mkdtemp -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +# Extract the first word of "composite", so it can be a program name with args. +set dummy composite; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_IM_COMPOSITE+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + case $IM_COMPOSITE in + [\\/]* | ?:[\\/]*) + ac_cv_path_IM_COMPOSITE="$IM_COMPOSITE" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_IM_COMPOSITE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -#ifdef __STDC__ -# include -#else -# include -#endif + test -z "$ac_cv_path_IM_COMPOSITE" && ac_cv_path_IM_COMPOSITE="notfound" + ;; +esac +fi +IM_COMPOSITE=$ac_cv_path_IM_COMPOSITE +if test -n "$IM_COMPOSITE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IM_COMPOSITE" >&5 +$as_echo "$IM_COMPOSITE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +# Extract the first word of "convert", so it can be a program name with args. +set dummy convert; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_IM_CONVERT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $IM_CONVERT in + [\\/]* | ?:[\\/]*) + ac_cv_path_IM_CONVERT="$IM_CONVERT" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_IM_CONVERT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + test -z "$ac_cv_path_IM_CONVERT" && ac_cv_path_IM_CONVERT="notfound" + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +fi +IM_CONVERT=$ac_cv_path_IM_CONVERT +if test -n "$IM_CONVERT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IM_CONVERT" >&5 +$as_echo "$IM_CONVERT" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + +# Extract the first word of "display", so it can be a program name with args. +set dummy display; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_IM_DISPLAY+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $IM_DISPLAY in + [\\/]* | ?:[\\/]*) + ac_cv_path_IM_DISPLAY="$IM_DISPLAY" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_IM_DISPLAY="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_IM_DISPLAY" && ac_cv_path_IM_DISPLAY="notfound" + ;; +esac fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - +IM_DISPLAY=$ac_cv_path_IM_DISPLAY +if test -n "$IM_DISPLAY"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IM_DISPLAY" >&5 +$as_echo "$IM_DISPLAY" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -done -# normally used for all file i/o - -for ac_func in popen -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +# Extract the first word of "montage", so it can be a program name with args. +set dummy montage; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_IM_MONTAGE+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif + case $IM_MONTAGE in + [\\/]* | ?:[\\/]*) + ac_cv_path_IM_MONTAGE="$IM_MONTAGE" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_IM_MONTAGE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + test -z "$ac_cv_path_IM_MONTAGE" && ac_cv_path_IM_MONTAGE="notfound" + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +fi +IM_MONTAGE=$ac_cv_path_IM_MONTAGE +if test -n "$IM_MONTAGE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IM_MONTAGE" >&5 +$as_echo "$IM_MONTAGE" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done +missing_magick="" +test "${IM_ANIMATE}" != "notfound" || missing_magick="${missing_magick} animate" +test "${IM_COMPARE}" != "notfound" || missing_magick="${missing_magick} compare" +test "${IM_COMPOSITE}" != "notfound" || missing_magick="${missing_magick} composite" +test "${IM_CONVERT}" != "notfound" || missing_magick="${missing_magick} convert" +test "${IM_DISPLAY}" != "notfound" || missing_magick="${missing_magick} display" +test "${IM_MONTAGE}" != "notfound" || missing_magick="${missing_magick} montage" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if all ImageMagick tools needed for the testsuite were found" >&5 +$as_echo_n "checking if all ImageMagick tools needed for the testsuite were found... " >&6; } +if test "X${missing_magick}" != "X" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. The testsuite will be disabled because the following +tools from the ImageMagick suite were not found: +${missing_magick} +No loss in pcb functionality should be experienced, you just will not +be able to run the full regression testsuite. +" >&5 +$as_echo "no. The testsuite will be disabled because the following +tools from the ImageMagick suite were not found: +${missing_magick} +No loss in pcb functionality should be experienced, you just will not +be able to run the full regression testsuite. +" >&6; } + have_magick=no +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_magick=yes +fi -# for lrealpath.c +have_test_tools=yes +test $have_magick = yes || have_test_tools=no -for ac_func in realpath canonicalize_file_name -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +# the RS274-X export HID is partially checked by looking at the result with +# gerbv +# Extract the first word of "gerbv", so it can be a program name with args. +set dummy gerbv; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GERBV+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + case $GERBV in + [\\/]* | ?:[\\/]*) + ac_cv_path_GERBV="$GERBV" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GERBV="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + test -z "$ac_cv_path_GERBV" && ac_cv_path_GERBV="notfound" + ;; +esac +fi +GERBV=$ac_cv_path_GERBV +if test -n "$GERBV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GERBV" >&5 +$as_echo "$GERBV" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func +test $GERBV != notfound || have_test_tools=no -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" + if test x$have_test_tools = xyes; then + HAVE_TEST_TOOLS_TRUE= + HAVE_TEST_TOOLS_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + HAVE_TEST_TOOLS_TRUE='#' + HAVE_TEST_TOOLS_FALSE= fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if all the requried testsuite tools were found" >&5 +$as_echo_n "checking if all the requried testsuite tools were found... " >&6; } +if test x$have_test_tools = xyes ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- the testsuite will be disabled" >&5 +$as_echo "no -- the testsuite will be disabled" >&6; } fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done -{ $as_echo "$as_me:$LINENO: checking whether canonicalize_file_name must be declared" >&5 -$as_echo_n "checking whether canonicalize_file_name must be declared... " >&6; } -if test "${libiberty_cv_decl_needed_canonicalize_file_name+set}" = set; then +# +############################################################################ + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 +$as_echo_n "checking for sqrt in -lm... " >&6; } +if test "${ac_cv_lib_m_sqrt+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include "confdefs.h" -#include -#ifdef HAVE_STRING_H -#include -#else -#ifdef HAVE_STRINGS_H -#include -#endif -#endif -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_UNISTD_H -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" #endif +char sqrt (); int main () { -char *(*pfn) = (char *(*)) canonicalize_file_name +return sqrt (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - libiberty_cv_decl_needed_canonicalize_file_name=no +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_sqrt=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - libiberty_cv_decl_needed_canonicalize_file_name=yes + ac_cv_lib_m_sqrt=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - -{ $as_echo "$as_me:$LINENO: result: $libiberty_cv_decl_needed_canonicalize_file_name" >&5 -$as_echo "$libiberty_cv_decl_needed_canonicalize_file_name" >&6; } -if test $libiberty_cv_decl_needed_canonicalize_file_name = yes; then - -cat >>confdefs.h <<\_ACEOF -#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 +$as_echo "$ac_cv_lib_m_sqrt" >&6; } +if test "x$ac_cv_lib_m_sqrt" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 _ACEOF -fi + LIBS="-lm $LIBS" +fi -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#include -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); int main () { - +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_lib_dl_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDL 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* + LIBS="-ldl $LIBS" fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lxnet" >&5 +$as_echo_n "checking for gethostbyname in -lxnet... " >&6; } +if test "${ac_cv_lib_xnet_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxnet $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyname (); +int +main () +{ +return gethostbyname (); + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xnet_gethostbyname=yes else - ac_cv_header_stdc=no + ac_cv_lib_xnet_gethostbyname=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xnet_gethostbyname" >&5 +$as_echo "$ac_cv_lib_xnet_gethostbyname" >&6; } +if test "x$ac_cv_lib_xnet_gethostbyname" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBXNET 1 +_ACEOF + + LIBS="-lxnet $LIBS" fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yywrap in -lfl" >&5 +$as_echo_n "checking for yywrap in -lfl... " >&6; } +if test "${ac_cv_lib_fl_yywrap+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char yywrap (); int main () { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; +return yywrap (); + ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_fl_yywrap=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no + ac_cv_lib_fl_yywrap=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fl_yywrap" >&5 +$as_echo "$ac_cv_lib_fl_yywrap" >&6; } +if test "x$ac_cv_lib_fl_yywrap" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBFL 1 +_ACEOF + LIBS="-lfl $LIBS" fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 +for ac_func in strerror +do : + ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" +if test "x$ac_cv_func_strerror" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRERROR 1 _ACEOF fi +done +for ac_func in regcomp re_comp +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done +for ac_func in logf expf rint +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done +for ac_func in vsnprintf +do : + ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" +if test "x$ac_cv_func_vsnprintf" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VSNPRINTF 1 +_ACEOF - -for ac_header in limits.h locale.h string.h sys/types.h regex.h pwd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +done + +for ac_func in getpwuid getcwd +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi +done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +for ac_func in rand random +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi +done -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +for ac_func in stat +do : + ac_fn_c_check_func "$LINENO" "stat" "ac_cv_func_stat" +if test "x$ac_cv_func_stat" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STAT 1 +_ACEOF - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +done + -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +for ac_func in mkdtemp +do : + ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp" +if test "x$ac_cv_func_mkdtemp" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_MKDTEMP 1 _ACEOF fi - done +# normally used for all file i/o +for ac_func in popen +do : + ac_fn_c_check_func "$LINENO" "popen" "ac_cv_func_popen" +if test "x$ac_cv_func_popen" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_POPEN 1 +_ACEOF +fi +done +# for lrealpath.c +for ac_func in realpath canonicalize_file_name +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done -for ac_header in sys/socket.h netinet/in.h netdb.h sys/param.h sys/times.h sys/wait.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether canonicalize_file_name must be declared" >&5 +$as_echo_n "checking whether canonicalize_file_name must be declared... " >&6; } +if test "${libiberty_cv_decl_needed_canonicalize_file_name+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> + +#include "confdefs.h" +#include +#ifdef HAVE_STRING_H +#include +#else +#ifdef HAVE_STRINGS_H +#include +#endif +#endif +#ifdef HAVE_STDLIB_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif +int +main () +{ +char *(*pfn) = (char *(*)) canonicalize_file_name + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_compile "$LINENO"; then : + libiberty_cv_decl_needed_canonicalize_file_name=no else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + libiberty_cv_decl_needed_canonicalize_file_name=yes fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libiberty_cv_decl_needed_canonicalize_file_name" >&5 +$as_echo "$libiberty_cv_decl_needed_canonicalize_file_name" >&6; } +if test $libiberty_cv_decl_needed_canonicalize_file_name = yes; then -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +$as_echo "#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1" >>confdefs.h - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + +# for pcb_spawnvp in action.c on Windows +for ac_func in _spawnvp +do : + ac_fn_c_check_func "$LINENO" "_spawnvp" "ac_cv_func__spawnvp" +if test "x$ac_cv_func__spawnvp" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE__SPAWNVP 1 _ACEOF fi - done -for ac_header in dlfcn.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <$ac_header> +#include + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_stdc=no +fi +rm -f conftest* - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - + ac_cv_header_stdc=no fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +rm -f conftest* fi -done - - -if test "x${WIN32}" = "xyes" ; then - -for ac_header in windows.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_run "$LINENO"; then : + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi - ac_header_compiler=no fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +$as_echo "#define STDC_HEADERS 1" >>confdefs.h -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> +fi + +for ac_header in limits.h locale.h string.h sys/types.h regex.h pwd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +done -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +for ac_header in sys/socket.h netinet/in.h netdb.h sys/param.h sys/times.h sys/wait.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + +done + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + +done + + +if test "x${WIN32}" = "xyes" ; then + for ac_header in windows.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_WINDOWS_H 1 _ACEOF fi @@ -20794,18 +14687,18 @@ # Search for glib pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 $as_echo_n "checking for GLIB... " >&6; } if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` else pkg_failed=yes @@ -20817,11 +14710,11 @@ pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` else pkg_failed=yes @@ -20833,6 +14726,8 @@ if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20847,9 +14742,7 @@ # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: result: Note: cannot find glib-2.0. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Note: cannot find glib-2.0. You may want to review the following errors: $GLIB_PKG_ERRORS" >&5 $as_echo "Note: cannot find glib-2.0. @@ -20857,7 +14750,9 @@ $GLIB_PKG_ERRORS" >&6; } elif test $pkg_failed = untried; then - { $as_echo "$as_me:$LINENO: result: Note: cannot find glib-2.0. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Note: cannot find glib-2.0. You may want to review the following errors: $GLIB_PKG_ERRORS" >&5 $as_echo "Note: cannot find glib-2.0. @@ -20867,264 +14762,18 @@ else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi for e in $HIDLIST; do case $e in lesstif ) - { $as_echo "$as_me:$LINENO: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } - - -# Check whether --with-x was given. -if test "${with_x+set}" = set; then - withval=$with_x; -fi - -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - case $x_includes,$x_libraries in #( - *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 -$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib la dll; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /usr/lib64 | /lib | /lib64) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -f -r conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi - -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do - if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" -esac -fi -;; #( - *) have_x=yes;; - esac - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - { $as_echo "$as_me:$LINENO: result: $have_x" >&5 -$as_echo "$have_x" >&6; } - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } -fi - -if test "$no_x" = yes; then + if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF +$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -21137,60 +14786,29 @@ X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 $as_echo_n "checking whether -R must be followed by a space... " >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -21201,46 +14819,19 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: neither works" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 $as_echo "neither works" >&6; } fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag LIBS=$ac_xsave_LIBS fi @@ -21256,11 +14847,7 @@ # libraries were built with DECnet support. And Karl Berry says # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21278,44 +14865,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21333,59 +14893,30 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_dnet_ntoa=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_dnet_ntoa=no + ac_cv_lib_dnet_dnet_ntoa=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21403,52 +14934,25 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dnet_stub_dnet_ntoa=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_stub_dnet_ntoa=no + ac_cv_lib_dnet_stub_dnet_ntoa=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -21459,105 +14963,20 @@ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 -$as_echo_n "checking for gethostbyname... " >&6; } -if test "${ac_cv_func_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -/* 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_gethostbyname || defined __stub___gethostbyname -choke me -#endif - -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_gethostbyname=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_gethostbyname=no -fi + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +if test "x$ac_cv_func_gethostbyname" = x""yes; then : -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -$as_echo "$ac_cv_func_gethostbyname" >&6; } if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21575,225 +14994,30 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_nsl_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_nsl_gethostbyname=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_bsd_gethostbyname=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_bsd_gethostbyname=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # 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. - { $as_echo "$as_me:$LINENO: checking for connect" >&5 -$as_echo_n "checking for connect... " >&6; } -if test "${ac_cv_func_connect+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char connect (); -/* 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_connect || defined __stub___connect -choke me -#endif - -int -main () -{ -return connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_connect=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_connect=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -$as_echo "$ac_cv_func_connect" >&6; } - - if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-lbsd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21802,85 +15026,55 @@ #ifdef __cplusplus extern "C" #endif -char connect (); +char gethostbyname (); int main () { -return connect (); +return gethostbyname (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_socket_connect=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_connect=no + ac_cv_lib_bsd_gethostbyname=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = x""yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 +$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi + fi fi - # Guillermo Gomez says -lposix is necessary on A/UX. - { $as_echo "$as_me:$LINENO: checking for remove" >&5 -$as_echo_n "checking for remove... " >&6; } -if test "${ac_cv_func_remove+set}" = set; then + # lieder@skyler.mavd.honeywell.com says without -lsocket, + # 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. + ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" +if test "x$ac_cv_func_connect" = x""yes; then : + +fi + + if test $ac_cv_func_connect = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +$as_echo_n "checking for connect in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_connect+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -21888,71 +15082,47 @@ #ifdef __cplusplus extern "C" #endif -char remove (); -/* 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_remove || defined __stub___remove -choke me -#endif - +char connect (); int main () { -return remove (); +return connect (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_remove=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_connect=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_remove=no + ac_cv_lib_socket_connect=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +$as_echo "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = x""yes; then : + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +fi + + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. + ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" +if test "x$ac_cv_func_remove" = x""yes; then : -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -$as_echo "$ac_cv_func_remove" >&6; } if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 $as_echo_n "checking for remove in -lposix... " >&6; } -if test "${ac_cv_lib_posix_remove+set}" = set; then +if test "${ac_cv_lib_posix_remove+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21970,148 +15140,38 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_posix_remove=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_posix_remove=no + ac_cv_lib_posix_remove=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 $as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = x""yes; then +if test "x$ac_cv_lib_posix_remove" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - { $as_echo "$as_me:$LINENO: checking for shmat" >&5 -$as_echo_n "checking for shmat... " >&6; } -if test "${ac_cv_func_shmat+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shmat (); -/* 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_shmat || defined __stub___shmat -choke me -#endif - -int -main () -{ -return shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shmat=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shmat=no -fi + ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" +if test "x$ac_cv_func_shmat" = x""yes; then : -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -$as_echo "$ac_cv_func_shmat" >&6; } if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 $as_echo_n "checking for shmat in -lipc... " >&6; } -if test "${ac_cv_lib_ipc_shmat+set}" = set; then +if test "${ac_cv_lib_ipc_shmat+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -22129,43 +15189,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ipc_shmat=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ipc_shmat=no + ac_cv_lib_ipc_shmat=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -22181,18 +15216,14 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -22210,43 +15241,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ICE_IceConnectionNumber=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ICE_IceConnectionNumber=no + ac_cv_lib_ICE_IceConnectionNumber=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -22255,19 +15261,14 @@ fi CPPFLAGS="$CFLAGS $X_CFLAGS" - -{ $as_echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5 $as_echo_n "checking for XOpenDisplay in -lX11... " >&6; } -if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then +if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -22285,43 +15286,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_X11_XOpenDisplay=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_X11_XOpenDisplay=no + ac_cv_lib_X11_XOpenDisplay=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5 $as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; } -if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then +if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBX11 1 _ACEOF @@ -22330,19 +15306,14 @@ fi - -{ $as_echo "$as_me:$LINENO: checking for main in -lICE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lICE" >&5 $as_echo_n "checking for main in -lICE... " >&6; } -if test "${ac_cv_lib_ICE_main+set}" = set; then +if test "${ac_cv_lib_ICE_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22354,43 +15325,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ICE_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ICE_main=no + ac_cv_lib_ICE_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_main" >&5 $as_echo "$ac_cv_lib_ICE_main" >&6; } -if test "x$ac_cv_lib_ICE_main" = x""yes; then +if test "x$ac_cv_lib_ICE_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBICE 1 _ACEOF @@ -22399,19 +15345,14 @@ fi - -{ $as_echo "$as_me:$LINENO: checking for main in -lSM" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lSM" >&5 $as_echo_n "checking for main in -lSM... " >&6; } -if test "${ac_cv_lib_SM_main+set}" = set; then +if test "${ac_cv_lib_SM_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lSM $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22423,43 +15364,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_SM_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_SM_main=no + ac_cv_lib_SM_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SM_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_main" >&5 $as_echo "$ac_cv_lib_SM_main" >&6; } -if test "x$ac_cv_lib_SM_main" = x""yes; then +if test "x$ac_cv_lib_SM_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSM 1 _ACEOF @@ -22468,67 +15384,37 @@ fi - -{ $as_echo "$as_me:$LINENO: checking for main in -lXext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXext" >&5 $as_echo_n "checking for main in -lXext... " >&6; } -if test "${ac_cv_lib_Xext_main+set}" = set; then +if test "${ac_cv_lib_Xext_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xext_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xext_main=no + ac_cv_lib_Xext_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_main" >&5 $as_echo "$ac_cv_lib_Xext_main" >&6; } -if test "x$ac_cv_lib_Xext_main" = x""yes; then +if test "x$ac_cv_lib_Xext_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBXEXT 1 _ACEOF @@ -22537,19 +15423,14 @@ fi - -{ $as_echo "$as_me:$LINENO: checking for XtOpenDisplay in -lXt" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XtOpenDisplay in -lXt" >&5 $as_echo_n "checking for XtOpenDisplay in -lXt... " >&6; } -if test "${ac_cv_lib_Xt_XtOpenDisplay+set}" = set; then +if test "${ac_cv_lib_Xt_XtOpenDisplay+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -22567,43 +15448,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xt_XtOpenDisplay=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xt_XtOpenDisplay=no + ac_cv_lib_Xt_XtOpenDisplay=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5 $as_echo "$ac_cv_lib_Xt_XtOpenDisplay" >&6; } -if test "x$ac_cv_lib_Xt_XtOpenDisplay" = x""yes; then +if test "x$ac_cv_lib_Xt_XtOpenDisplay" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBXT 1 _ACEOF @@ -22612,19 +15468,14 @@ fi - -{ $as_echo "$as_me:$LINENO: checking for main in -lXmu" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXmu" >&5 $as_echo_n "checking for main in -lXmu... " >&6; } -if test "${ac_cv_lib_Xmu_main+set}" = set; then +if test "${ac_cv_lib_Xmu_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXmu $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22636,43 +15487,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xmu_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xmu_main=no + ac_cv_lib_Xmu_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_main" >&5 $as_echo "$ac_cv_lib_Xmu_main" >&6; } -if test "x$ac_cv_lib_Xmu_main" = x""yes; then +if test "x$ac_cv_lib_Xmu_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBXMU 1 _ACEOF @@ -22681,19 +15507,14 @@ fi - -{ $as_echo "$as_me:$LINENO: checking for main in -lXpm" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXpm" >&5 $as_echo_n "checking for main in -lXpm... " >&6; } -if test "${ac_cv_lib_Xpm_main+set}" = set; then +if test "${ac_cv_lib_Xpm_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22705,43 +15526,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xpm_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xpm_main=no + ac_cv_lib_Xpm_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_main" >&5 $as_echo "$ac_cv_lib_Xpm_main" >&6; } -if test "x$ac_cv_lib_Xpm_main" = x""yes; then +if test "x$ac_cv_lib_Xpm_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBXPM 1 _ACEOF @@ -22750,19 +15546,14 @@ fi - -{ $as_echo "$as_me:$LINENO: checking for XmCreateMainWindow in -lXm" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmCreateMainWindow in -lXm" >&5 $as_echo_n "checking for XmCreateMainWindow in -lXm... " >&6; } -if test "${ac_cv_lib_Xm_XmCreateMainWindow+set}" = set; then +if test "${ac_cv_lib_Xm_XmCreateMainWindow+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXm $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -22780,43 +15571,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xm_XmCreateMainWindow=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xm_XmCreateMainWindow=no + ac_cv_lib_Xm_XmCreateMainWindow=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xm_XmCreateMainWindow" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmCreateMainWindow" >&5 $as_echo "$ac_cv_lib_Xm_XmCreateMainWindow" >&6; } -if test "x$ac_cv_lib_Xm_XmCreateMainWindow" = x""yes; then +if test "x$ac_cv_lib_Xm_XmCreateMainWindow" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBXM 1 _ACEOF @@ -22827,152 +15593,16 @@ case $ac_cv_lib_Xm_XmCreateMainWindow in no ) - { { $as_echo "$as_me:$LINENO: error: You don't seem to have the Lesstif development environment installed." >&5 -$as_echo "$as_me: error: You don't seem to have the Lesstif development environment installed." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "You don't seem to have the Lesstif development environment installed." "$LINENO" 5 ;; * ) ;; esac - -for ac_header in Xm/Xm.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in Xm/Xm.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_XM_XM_H 1 _ACEOF fi @@ -22981,9 +15611,7 @@ case $ac_cv_header_Xm_Xm_h in no ) - { { $as_echo "$as_me:$LINENO: error: You don't seem to have the Lesstif development environment installed." >&5 -$as_echo "$as_me: error: You don't seem to have the Lesstif development environment installed." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "You don't seem to have the Lesstif development environment installed." "$LINENO" 5 ;; * ) ;; esac @@ -22993,9 +15621,9 @@ # Check for pkg-config # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -23008,14 +15636,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" @@ -23024,35 +15652,33 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test "$PKG_CONFIG" = "no"; then - { { $as_echo "$as_me:$LINENO: error: Cannot find pkg-config, make sure it is installed and in your PATH" >&5 -$as_echo "$as_me: error: Cannot find pkg-config, make sure it is installed and in your PATH" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "Cannot find pkg-config, make sure it is installed and in your PATH" "$LINENO" 5 fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.4.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.4.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.18.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.18.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4.0" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.18.0" 2>/dev/null` else pkg_failed=yes fi @@ -23063,12 +15689,12 @@ pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.4.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.4.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.18.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.18.0") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4.0" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.18.0" 2>/dev/null` else pkg_failed=yes fi @@ -23079,6 +15705,8 @@ if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23086,204 +15714,125 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.4.0" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.18.0" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.4.0" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.18.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: Cannot find gtk+ >= 2.4.0, install it and rerun ./configure + as_fn_error $? "Cannot find gtk+ >= 2.18.0, install it and rerun ./configure Please review the following errors: -$GTK_PKG_ERRORS" >&5 -$as_echo "$as_me: error: Cannot find gtk+ >= 2.4.0, install it and rerun ./configure -Please review the following errors: -$GTK_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } +$GTK_PKG_ERRORS" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: Cannot find gtk+ >= 2.4.0, install it and rerun ./configure -Please review the following errors: -$GTK_PKG_ERRORS" >&5 -$as_echo "$as_me: error: Cannot find gtk+ >= 2.4.0, install it and rerun ./configure + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Cannot find gtk+ >= 2.18.0, install it and rerun ./configure Please review the following errors: -$GTK_PKG_ERRORS" >&2;} - { (exit 1); exit 1; }; } +$GTK_PKG_ERRORS" "$LINENO" 5 else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion` + GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion` - # if we are building for gtk >= 2.8.0, we can use gdk_display_warp_pointer() - # otherwise we need XWarpPointer and we'll pull in the required headers with - # gdk/gdkx.h and we'll need to link with X11 - if ! $PKG_CONFIG gtk+-2.0 --atleast-version=2.8.0 ; then - CPPFLAGS="$CFLAGS $GTK_CFLAGS" - -for ac_header in gdk/gdkx.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + if test "x$enable_gl" = "xyes"; then + # Check for GtkGLExt + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKGLEXT" >&5 +$as_echo_n "checking for GTKGLEXT... " >&6; } + +if test -n "$GTKGLEXT_CFLAGS"; then + pkg_cv_GTKGLEXT_CFLAGS="$GTKGLEXT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkglext-1.0 >= 1.0.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtkglext-1.0 >= 1.0.0") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKGLEXT_CFLAGS=`$PKG_CONFIG --cflags "gtkglext-1.0 >= 1.0.0" 2>/dev/null` else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + pkg_failed=yes fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + else + pkg_failed=untried +fi +if test -n "$GTKGLEXT_LIBS"; then + pkg_cv_GTKGLEXT_LIBS="$GTKGLEXT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkglext-1.0 >= 1.0.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtkglext-1.0 >= 1.0.0") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKGLEXT_LIBS=`$PKG_CONFIG --libs "gtkglext-1.0 >= 1.0.0" 2>/dev/null` else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + pkg_failed=yes +fi + else + pkg_failed=untried fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - eval "$as_ac_Header=\$ac_header_preproc" + _pkg_short_errors_supported=no fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + if test $_pkg_short_errors_supported = yes; then + GTKGLEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtkglext-1.0 >= 1.0.0" 2>&1` + else + GTKGLEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkglext-1.0 >= 1.0.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKGLEXT_PKG_ERRORS" >&5 -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + as_fn_error $? " +*** Required version of gtkglext is not installed - please install first *** +Please review the following errors: +$GTKGLEXT_PKG_ERRORS" "$LINENO" 5 -fi +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? " +*** Required version of gtkglext is not installed - please install first *** +Please review the following errors: +$GTKGLEXT_PKG_ERRORS" "$LINENO" 5 -done +else + GTKGLEXT_CFLAGS=$pkg_cv_GTKGLEXT_CFLAGS + GTKGLEXT_LIBS=$pkg_cv_GTKGLEXT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi + GTKGLEXT_VER=`$PKG_CONFIG gtkglext-1.0 --modversion` fi - GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion` ;; gcode|nelma|png ) # Check for gdlib-config for gd (www.boutell.com/gd) # Extract the first word of "gdlib-config", so it can be a program name with args. set dummy gdlib-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GDLIB_CONFIG+set}" = set; then +if test "${ac_cv_path_GDLIB_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GDLIB_CONFIG in @@ -23296,14 +15845,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GDLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GDLIB_CONFIG" && ac_cv_path_GDLIB_CONFIG="no" @@ -23312,16 +15861,16 @@ fi GDLIB_CONFIG=$ac_cv_path_GDLIB_CONFIG if test -n "$GDLIB_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $GDLIB_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDLIB_CONFIG" >&5 $as_echo "$GDLIB_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test "$GDLIB_CONFIG" = "no"; then - { $as_echo "$as_me:$LINENO: result: Cannot find gdlib-config. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Cannot find gdlib-config. Make sure it is installed and in your PATH. gdlib-config is part of the GD library available from www.boutell.com/gd. This is needed for the png HID. I will look for libgd anyway and maybe @@ -23334,19 +15883,14 @@ you will get lucky. " >&6; } if test "$WIN32" != "yes" ; then - -{ $as_echo "$as_me:$LINENO: checking for main in -lgd" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgd" >&5 $as_echo_n "checking for main in -lgd... " >&6; } -if test "${ac_cv_lib_gd_main+set}" = set; then +if test "${ac_cv_lib_gd_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23358,43 +15902,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_gd_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gd_main=no + ac_cv_lib_gd_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gd_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_main" >&5 $as_echo "$ac_cv_lib_gd_main" >&6; } -if test "x$ac_cv_lib_gd_main" = x""yes; then +if test "x$ac_cv_lib_gd_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBGD 1 _ACEOF @@ -23402,25 +15921,18 @@ LIBS="-lgd $LIBS" else - { { $as_echo "$as_me:$LINENO: error: You have requested gcode, nelma, or png HIDs but -lgd could not be found" >&5 -$as_echo "$as_me: error: You have requested gcode, nelma, or png HIDs but -lgd could not be found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "You have requested gcode, nelma, or png HIDs but -lgd could not be found" "$LINENO" 5 fi else - -{ $as_echo "$as_me:$LINENO: checking for main in -lbgd" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lbgd" >&5 $as_echo_n "checking for main in -lbgd... " >&6; } -if test "${ac_cv_lib_bgd_main+set}" = set; then +if test "${ac_cv_lib_bgd_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lbgd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23432,43 +15944,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_bgd_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_bgd_main=no + ac_cv_lib_bgd_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bgd_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bgd_main" >&5 $as_echo "$ac_cv_lib_bgd_main" >&6; } -if test "x$ac_cv_lib_bgd_main" = x""yes; then +if test "x$ac_cv_lib_bgd_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBBGD 1 _ACEOF @@ -23476,9 +15963,7 @@ LIBS="-lbgd $LIBS" else - { { $as_echo "$as_me:$LINENO: error: You have requested gcode, nelma, or png HIDs but -lbgd could not be found" >&5 -$as_echo "$as_me: error: You have requested gcode, nelma, or png HIDs but -lbgd could not be found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "You have requested gcode, nelma, or png HIDs but -lbgd could not be found" "$LINENO" 5 fi fi @@ -23488,15 +15973,15 @@ else GD=gd fi - { $as_echo "$as_me:$LINENO: checking for libgd cflags" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgd cflags" >&5 $as_echo_n "checking for libgd cflags... " >&6; } GD_CFLAGS="`$GDLIB_CONFIG --cflags`" - { $as_echo "$as_me:$LINENO: result: $GD_CFLAGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GD_CFLAGS" >&5 $as_echo "$GD_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking for libgd libs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgd libs" >&5 $as_echo_n "checking for libgd libs... " >&6; } GD_LIBS="`$GDLIB_CONFIG --ldflags` `$GDLIB_CONFIG --libs` -l${GD}" - { $as_echo "$as_me:$LINENO: result: $GD_LIBS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GD_LIBS" >&5 $as_echo "$GD_LIBS" >&6; } fi @@ -23505,146 +15990,12 @@ # is not there. CFLAGS="$CFLAGS $GD_CFLAGS" CPPFLAGS="$CPPFLAGS $GD_CFLAGS" - -for ac_header in gd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in gd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "gd.h" "ac_cv_header_gd_h" "$ac_includes_default" +if test "x$ac_cv_header_gd_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_GD_H 1 _ACEOF fi @@ -23653,15 +16004,10 @@ case $ac_cv_header_gd_h in no ) - { { $as_echo "$as_me:$LINENO: error: + as_fn_error $? " You evidentally do not have a complete installation of the GD library available from www.boutell.com/gd. This is needed for the nelma and/or png HID. -" >&5 -$as_echo "$as_me: error: -You evidentally do not have a complete installation of the GD library available from www.boutell.com/gd. -This is needed for the nelma and/or png HID. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 ;; * ) ;; esac @@ -23672,412 +16018,130 @@ save_LIBS="$LIBS" LIBS="$save_LIBS $GD_LIBS $X_LIBS" - { $as_echo "$as_me:$LINENO: checking if GIF output from the png HID is desired" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GIF output from the png HID is desired" >&5 $as_echo_n "checking if GIF output from the png HID is desired... " >&6; } # Check whether --enable-gif was given. -if test "${enable_gif+set}" = set; then +if test "${enable_gif+set}" = set; then : enableval=$enable_gif; if test "X$enable_gif" != "Xno" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } with_gif=yes else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } with_gif=no fi else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } with_gif=yes fi if test "X$with_gif" = "Xyes" ; then - -for ac_func in gdImageGif -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in gdImageGif +do : + ac_fn_c_check_func "$LINENO" "gdImageGif" "ac_cv_func_gdImageGif" +if test "x$ac_cv_func_gdImageGif" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_GDIMAGEGIF 1 _ACEOF fi done if test "$ac_cv_func_gdImageGif" != "yes"; then - { { $as_echo "$as_me:$LINENO: error: Your gd installation does not appear to include gif support. + as_fn_error $? "Your gd installation does not appear to include gif support. You may need to update your installation of gd or disable -gif export with --disable-gif" >&5 -$as_echo "$as_me: error: Your gd installation does not appear to include gif support. -You may need to update your installation of gd or disable -gif export with --disable-gif" >&2;} - { (exit 1); exit 1; }; } +gif export with --disable-gif" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: checking if JPEG output from the png HID is desired" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if JPEG output from the png HID is desired" >&5 $as_echo_n "checking if JPEG output from the png HID is desired... " >&6; } # Check whether --enable-jpeg was given. -if test "${enable_jpeg+set}" = set; then +if test "${enable_jpeg+set}" = set; then : enableval=$enable_jpeg; if test "X$enable_jpeg" != "Xno" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } with_jpeg=yes else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } with_jpeg=no fi else - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } with_jpeg=yes fi if test "X$with_jpeg" = "Xyes" ; then - -for ac_func in gdImageJpeg -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in gdImageJpeg +do : + ac_fn_c_check_func "$LINENO" "gdImageJpeg" "ac_cv_func_gdImageJpeg" +if test "x$ac_cv_func_gdImageJpeg" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_GDIMAGEJPEG 1 _ACEOF fi done if test "$ac_cv_func_gdImageJpeg" != "yes"; then - { { $as_echo "$as_me:$LINENO: error: Your gd installation does not appear to include JPEG support. + as_fn_error $? "Your gd installation does not appear to include JPEG support. You may need to update your installation of gd or disable -JPEG export with --disable-jpeg" >&5 -$as_echo "$as_me: error: Your gd installation does not appear to include JPEG support. -You may need to update your installation of gd or disable -JPEG export with --disable-jpeg" >&2;} - { (exit 1); exit 1; }; } +JPEG export with --disable-jpeg" "$LINENO" 5 fi fi - { $as_echo "$as_me:$LINENO: checking if PNG output from the png HID is desired" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PNG output from the png HID is desired" >&5 $as_echo_n "checking if PNG output from the png HID is desired... " >&6; } # Check whether --enable-png was given. -if test "${enable_png+set}" = set; then +if test "${enable_png+set}" = set; then : enableval=$enable_png; if test "X$enable_png" != "Xno" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } with_png=yes else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } with_png=no fi - -else - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - with_png=yes - -fi - - if test "X$with_png" = "Xyes" ; then - -for ac_func in gdImagePng -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + with_png=yes -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + + if test "X$with_png" = "Xyes" ; then + for ac_func in gdImagePng +do : + ac_fn_c_check_func "$LINENO" "gdImagePng" "ac_cv_func_gdImagePng" +if test "x$ac_cv_func_gdImagePng" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_GDIMAGEPNG 1 _ACEOF fi done if test "$ac_cv_func_gdImagePng" != "yes"; then - { { $as_echo "$as_me:$LINENO: error: Your gd installation does not appear to include PNG support. + as_fn_error $? "Your gd installation does not appear to include PNG support. You may need to update your installation of gd or disable -PNG export with --disable-png" >&5 -$as_echo "$as_me: error: Your gd installation does not appear to include PNG support. -You may need to update your installation of gd or disable -PNG export with --disable-png" >&2;} - { (exit 1); exit 1; }; } +PNG export with --disable-png" "$LINENO" 5 fi fi LIBS="$save_LIBS" @@ -24105,16 +16169,16 @@ # ------------- check if png previews should be built for pcblib-newlib -{ $as_echo "$as_me:$LINENO: checking if the m4lib to newlib export should create png previews" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the m4lib to newlib export should create png previews" >&5 $as_echo_n "checking if the m4lib to newlib export should create png previews... " >&6; } # Check whether --enable-m4lib-png was given. -if test "${enable_m4lib_png+set}" = set; then +if test "${enable_m4lib_png+set}" = set; then : enableval=$enable_m4lib_png; else enable_m4lib_png=no fi -{ $as_echo "$as_me:$LINENO: result: $enable_m4lib_png" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_m4lib_png" >&5 $as_echo "$enable_m4lib_png" >&6; } if test x$enable_m4lib_png = xyes; then PNG_PREVIEW_TRUE= @@ -24136,16 +16200,16 @@ # want to kick this code in when *not* building from git or cvs sources. build_pcblib_newlib=no if test "$pcb_sources" = "tarball" ; then - { $as_echo "$as_me:$LINENO: checking If pcblib-newlib was built with png previews" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking If pcblib-newlib was built with png previews" >&5 $as_echo_n "checking If pcblib-newlib was built with png previews... " >&6; } stamp=$srcdir/lib/pcblib-newlib.stamp if test ! -f ${stamp} ; then - { $as_echo "$as_me:$LINENO: result: unknown, missing ${stamp}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown, missing ${stamp}" >&5 $as_echo "unknown, missing ${stamp}" >&6; } build_pcblib_newlib=yes else if test "`cat ${stamp}`" = "png-preview=yes" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } # lib exists and built with preview. # if we don't want the preview, than rebuild @@ -24153,7 +16217,7 @@ build_pcblib_newlib=yes fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } # lib exists and built without preview. # if we want the preview, than rebuild @@ -24165,9 +16229,9 @@ else build_pcblib_newlib=yes fi -{ $as_echo "$as_me:$LINENO: checking If pcblib-newlib needs to be rebuilt" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking If pcblib-newlib needs to be rebuilt" >&5 $as_echo_n "checking If pcblib-newlib needs to be rebuilt... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $build_pcblib_newlib" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $build_pcblib_newlib" >&5 $as_echo "$build_pcblib_newlib" >&6; } if test x$build_pcblib_newlib = xyes; then BUILD_PCBLIB_NEWLIB_TRUE= @@ -24182,9 +16246,9 @@ # we are cross compiling so we will need a build host binary for pcb # Extract the first word of "pcb", so it can be a program name with args. set dummy pcb; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PCB+set}" = set; then +if test "${ac_cv_path_PCB+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PCB in @@ -24197,14 +16261,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PCB="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_PCB" && ac_cv_path_PCB="notfound" @@ -24213,10 +16277,10 @@ fi PCB=$ac_cv_path_PCB if test -n "$PCB"; then - { $as_echo "$as_me:$LINENO: result: $PCB" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCB" >&5 $as_echo "$PCB" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -24231,41 +16295,28 @@ if test "X$pcb_git_version" = "Xyes" ; then if test "X$docs_yesno" = "Xyes" -o "X$enable_m4lib_png" = "Xyes" ; then if test "$PCB" = "notfound" ; then - { { $as_echo "$as_me:$LINENO: error: You have selected a build with m4lib png -previews enabled and/or with building the documentation enabled but you also -appear to be cross-compiling. For this to work, you must have a pcb installed that -can run on this machine (the build machine) because it is needed for generating -library footprint png previews as well as some of the figures in the documentation. -If you wish to skip building the documentation and the footprint previews then add ---disable-doc --disable-m4lib-png -This will allow your cross build to work." >&5 -$as_echo "$as_me: error: You have selected a build with m4lib png + as_fn_error $? "You have selected a build with m4lib png previews enabled and/or with building the documentation enabled but you also appear to be cross-compiling. For this to work, you must have a pcb installed that can run on this machine (the build machine) because it is needed for generating library footprint png previews as well as some of the figures in the documentation. If you wish to skip building the documentation and the footprint previews then add --disable-doc --disable-m4lib-png -This will allow your cross build to work." >&2;} - { (exit 1); exit 1; }; } +This will allow your cross build to work." "$LINENO" 5 fi fi fi # ------------- Xrender ------------------- have_xrender=no -{ $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension in -lXrender" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5 $as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; } -if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then +if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrender $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -24283,43 +16334,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_Xrender_XRenderQueryExtension=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xrender_XRenderQueryExtension=no + ac_cv_lib_Xrender_XRenderQueryExtension=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 $as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; } -if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then +if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then : have_xrender=yes else have_xrender=no @@ -24327,7 +16353,7 @@ # Check whether --enable-xrender was given. -if test "${enable_xrender+set}" = set; then +if test "${enable_xrender+set}" = set; then : enableval=$enable_xrender; fi @@ -24337,172 +16363,98 @@ * ) X_LIBS="-lXrender $X_LIBS" -cat >>confdefs.h <<\_ACEOF -#define HAVE_XRENDER 1 -_ACEOF +$as_echo "#define HAVE_XRENDER 1" >>confdefs.h ;; esac -# ------------- dmalloc ------------------- -with_dmalloc=no -{ $as_echo "$as_me:$LINENO: checking if dmalloc debugging should be enabled" >&5 -$as_echo_n "checking if dmalloc debugging should be enabled... " >&6; } -# Check whether --enable-dmalloc was given. -if test "${enable_dmalloc+set}" = set; then - enableval=$enable_dmalloc; -if test "X$enable_dmalloc" != "Xno" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - if test "${ac_cv_header_dmalloc_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for dmalloc.h" >&5 -$as_echo_n "checking for dmalloc.h... " >&6; } -if test "${ac_cv_header_dmalloc_h+set}" = set; then +# ------------- Xinerama ------------------- +have_xinerama=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryExtension in -lXinerama" >&5 +$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } +if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dmalloc_h" >&5 -$as_echo "$ac_cv_header_dmalloc_h" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking dmalloc.h usability" >&5 -$as_echo_n "checking dmalloc.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXinerama $X_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XineramaQueryExtension (); +int +main () +{ +return XineramaQueryExtension (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xinerama_XineramaQueryExtension=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + ac_cv_lib_Xinerama_XineramaQueryExtension=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking dmalloc.h presence" >&5 -$as_echo_n "checking dmalloc.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 +$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } +if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then : + have_xinerama=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + have_xinerama=no +fi - ac_header_preproc=no + +# Check whether --enable-xinerama was given. +if test "${enable_xinerama+set}" = set; then : + enableval=$enable_xinerama; fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +case "$have_xinerama:$enable_xinerama" in + no:* ) ;; + *:no ) ;; + * ) + X_LIBS="-lXinerama $X_LIBS" -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: dmalloc.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: dmalloc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: dmalloc.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: dmalloc.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: dmalloc.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: dmalloc.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: dmalloc.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: dmalloc.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: dmalloc.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: dmalloc.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: dmalloc.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: dmalloc.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: dmalloc.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: dmalloc.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: dmalloc.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: dmalloc.h: in the future, the compiler will take precedence" >&2;} +$as_echo "#define HAVE_XINERAMA 1" >>confdefs.h - ;; + ;; esac -{ $as_echo "$as_me:$LINENO: checking for dmalloc.h" >&5 -$as_echo_n "checking for dmalloc.h... " >&6; } -if test "${ac_cv_header_dmalloc_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_dmalloc_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dmalloc_h" >&5 -$as_echo "$ac_cv_header_dmalloc_h" >&6; } -fi -if test "x$ac_cv_header_dmalloc_h" = x""yes; then - : +# ------------- dmalloc ------------------- +with_dmalloc=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dmalloc debugging should be enabled" >&5 +$as_echo_n "checking if dmalloc debugging should be enabled... " >&6; } +# Check whether --enable-dmalloc was given. +if test "${enable_dmalloc+set}" = set; then : + enableval=$enable_dmalloc; +if test "X$enable_dmalloc" != "Xno" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + ac_fn_c_check_header_mongrel "$LINENO" "dmalloc.h" "ac_cv_header_dmalloc_h" "$ac_includes_default" +if test "x$ac_cv_header_dmalloc_h" = x""yes; then : + else - { { $as_echo "$as_me:$LINENO: error: You have requested dmalloc debugging but dmalloc.h could not be found" >&5 -$as_echo "$as_me: error: You have requested dmalloc debugging but dmalloc.h could not be found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "You have requested dmalloc debugging but dmalloc.h could not be found" "$LINENO" 5 fi - -{ $as_echo "$as_me:$LINENO: checking for main in -ldmalloc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldmalloc" >&5 $as_echo_n "checking for main in -ldmalloc... " >&6; } -if test "${ac_cv_lib_dmalloc_main+set}" = set; then +if test "${ac_cv_lib_dmalloc_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24514,43 +16466,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dmalloc_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dmalloc_main=no + ac_cv_lib_dmalloc_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_main" >&5 $as_echo "$ac_cv_lib_dmalloc_main" >&6; } -if test "x$ac_cv_lib_dmalloc_main" = x""yes; then +if test "x$ac_cv_lib_dmalloc_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBDMALLOC 1 _ACEOF @@ -24558,22 +16485,20 @@ LIBS="-ldmalloc $LIBS" else - { { $as_echo "$as_me:$LINENO: error: You have requested dmalloc debugging but -ldmalloc could not be found" >&5 -$as_echo "$as_me: error: You have requested dmalloc debugging but -ldmalloc could not be found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "You have requested dmalloc debugging but -ldmalloc could not be found" "$LINENO" 5 fi DMALLOC_LIBS="-ldmalloc" with_dmalloc=yes else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } DMALLOC_LIBS="" fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } DMALLOC_LIBS="" @@ -24582,27 +16507,22 @@ # ------------- ElectricFence ------------------- with_efence=no -{ $as_echo "$as_me:$LINENO: checking if ElectricFence debugging should be enabled" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ElectricFence debugging should be enabled" >&5 $as_echo_n "checking if ElectricFence debugging should be enabled... " >&6; } # Check whether --enable-efence was given. -if test "${enable_efence+set}" = set; then +if test "${enable_efence+set}" = set; then : enableval=$enable_efence; if test "X$enable_efence" != "Xno" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for main in -lefence" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lefence" >&5 $as_echo_n "checking for main in -lefence... " >&6; } -if test "${ac_cv_lib_efence_main+set}" = set; then +if test "${ac_cv_lib_efence_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lefence $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24614,43 +16534,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_efence_main=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_efence_main=no + ac_cv_lib_efence_main=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_efence_main" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_main" >&5 $as_echo "$ac_cv_lib_efence_main" >&6; } -if test "x$ac_cv_lib_efence_main" = x""yes; then +if test "x$ac_cv_lib_efence_main" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBEFENCE 1 _ACEOF @@ -24658,37 +16553,35 @@ LIBS="-lefence $LIBS" else - { { $as_echo "$as_me:$LINENO: error: You have requested ElectricFence debugging but -lefence could not be found" >&5 -$as_echo "$as_me: error: You have requested ElectricFence debugging but -lefence could not be found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "You have requested ElectricFence debugging but -lefence could not be found" "$LINENO" 5 fi with_efence=yes else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi else -{ $as_echo "$as_me:$LINENO: result: no" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # ------------- Enable Debug code ------------------- -{ $as_echo "$as_me:$LINENO: checking for whether to enable debugging code" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether to enable debugging code" >&5 $as_echo_n "checking for whether to enable debugging code... " >&6; } # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; else enable_debug=no fi -{ $as_echo "$as_me:$LINENO: result: $enable_debug" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_debug" >&5 $as_echo "$enable_debug" >&6; } if test x$enable_debug = xyes; then DEBUG_BUILD_TRUE= @@ -24699,31 +16592,272 @@ fi +# ------------- mkdir required for win32 compatibility ------------ +# WIN32 mkdir takes only one argument, POSIX takes two. +# #include "misc.h" where mkdir is required. +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_func_mkdir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FUNC_MKDIR +# +# DESCRIPTION +# +# Check whether mkdir() is mkdir or _mkdir, and whether it takes one or +# two arguments. +# +# This macro can define HAVE_MKDIR, HAVE__MKDIR, and MKDIR_TAKES_ONE_ARG, +# which are expected to be used as follows: +# +# #if HAVE_MKDIR +# # if MKDIR_TAKES_ONE_ARG +# /* MinGW32 */ +# # define mkdir(a, b) mkdir(a) +# # endif +# #else +# # if HAVE__MKDIR +# /* plain Windows 32 */ +# # define mkdir(a, b) _mkdir(a) +# # else +# # error "Don't know how to create a directory on this system." +# # endif +# #endif +# +# LICENSE +# +# Copyright (c) 2008 Alexandre Duret-Lutz +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +# This is what autoupdate's m4 run will expand. It fires +# the warning (with _au_warn_XXX), outputs it into the +# updated configure.ac (with AC_DIAGNOSE), and then outputs +# the replacement expansion. + + +# This is an auxiliary macro that is also run when +# autoupdate runs m4. It simply calls m4_warning, but +# we need a wrapper so that each warning is emitted only +# once. We break the quoting in m4_warning's argument in +# order to expand this macro's arguments, not AU_DEFUN's. + + +# Finally, this is the expansion that is picked up by +# autoconf. It tells the user to run autoupdate, and +# then outputs the replacement expansion. We do not care +# about autoupdate's warning because that contains +# information on what to do *after* running autoupdate. + + + + +for ac_func in mkdir _mkdir +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir takes one argument" >&5 +$as_echo_n "checking whether mkdir takes one argument... " >&6; } +if test "${ac_cv_mkdir_takes_one_arg+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if HAVE_UNISTD_H +# include +#endif + +int +main () +{ +mkdir ("."); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_mkdir_takes_one_arg=yes +else + ac_cv_mkdir_takes_one_arg=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mkdir_takes_one_arg" >&5 +$as_echo "$ac_cv_mkdir_takes_one_arg" >&6; } +if test x"$ac_cv_mkdir_takes_one_arg" = xyes; then + +$as_echo "#define MKDIR_TAKES_ONE_ARG 1" >>confdefs.h + +fi + + +# ------------- Type used for "Coord" type ------------------- + +for ac_header in stdint.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H 1 +_ACEOF + +fi + +done + +# Check whether --enable-coord64 was given. +if test "${enable_coord64+set}" = set; then : + enableval=$enable_coord64; +else + enable_coord64=no +fi + +# Check whether --enable-coord32 was given. +if test "${enable_coord32+set}" = set; then : + enableval=$enable_coord32; +else + enable_coord32=no +fi + + +COORDTYPE="long" + +echo "$enable_coord32:$enable_coord64:$ac_cv_header_stdint_h" +case "$enable_coord32:$enable_coord64:$ac_cv_header_stdint_h" in + yes:no:yes ) + COORD_TYPE="int32_t" + COORD_MAX="INT32_MAX" + ;; + no:yes:yes ) + COORD_TYPE="int64_t" + COORD_MAX="INT64_MAX" + ;; + yes:no:no ) + COORD_TYPE="int" + COORD_MAX="INT_MAX" + ;; + no:yes:no ) + COORD_TYPE="long long" + COORD_MAX="LLONG_MAX" + ;; + yes:yes:* ) + as_fn_error $? "\"*** cannot require both 32 and 64 bit coordinates\"" "$LINENO" 5 + ;; + *:*:* ) + COORD_TYPE="long" + COORD_MAX="LONG_MAX" + ;; +esac + +cat >>confdefs.h <<_ACEOF +#define COORD_TYPE $COORD_TYPE +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define COORD_MAX $COORD_MAX +_ACEOF + + +# ------------- Complete set of CFLAGS and LIBS ------------------- + +CFLAGS="$CFLAGS $X_CFLAGS $DBUS_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $CAIRO_CFLAGS $GTKGLEXT_CFLAGS $GLU_CFLAGS $GL_CFLAGS" +LIBS="$LIBS $XM_LIBS $DBUS_LIBS $X_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GD_LIBS $INTLLIBS $CAIRO_LIBS $GTKGLEXT_LIBS $GLU_LIBS $GL_LIBS" + + +# if we have gcc then add -Wall +if test "x$GCC" = "xyes"; then + # see about adding some extra checks if the compiler takes them + for flag in -Wall ; do + case " ${CFLAGS} " in + *\ ${flag}\ *) + # flag is already present + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler accepts ${flag}" >&5 +$as_echo_n "checking if the compiler accepts ${flag}... " >&6; } + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS ${flag}" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CFLAGS="$ac_save_CFLAGS" -# ------------- Complete set of CFLAGS and LIBS ------------------- -CFLAGS="$CFLAGS $X_CFLAGS $DBUS_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $CAIRO_CFLAGS" -LIBS="$LIBS $XM_LIBS $DBUS_LIBS $X_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GD_LIBS $INTLLIBS $CAIRO_LIBS" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + esac + done +fi +CXXFLAGS="$CFLAGS" -# if we have gcc then add -Wall +# Now add C-specific flags if test "x$GCC" = "xyes"; then # see about adding some extra checks if the compiler takes them - for flag in -Wall -Wdeclaration-after-statement ; do + for flag in -Wdeclaration-after-statement ; do case " ${CFLAGS} " in *\ ${flag}\ *) # flag is already present ;; *) - { $as_echo "$as_me:$LINENO: checking if the compiler accepts ${flag}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler accepts ${flag}" >&5 $as_echo_n "checking if the compiler accepts ${flag}... " >&6; } ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS ${flag}" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -24734,43 +16868,44 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } CFLAGS="$ac_save_CFLAGS" fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac done fi +# See if we are building gcc with C++. +# Check whether --enable-build-with-cxx was given. +if test "${enable_build_with_cxx+set}" = set; then : + enableval=$enable_build_with_cxx; ENABLE_BUILD_WITH_CXX=$enableval +else + ENABLE_BUILD_WITH_CXX=no +fi + + +case "$ENABLE_BUILD_WITH_CXX" in + yes) + CC_OR_CXX="$CXX" + CC_OR_CXX_FLAGS="$CXXFLAGS" + ;; + no) + CC_OR_CXX="$CC" + CC_OR_CXX_FLAGS="$CFLAGS" + ;; +esac + + + # font filename FONTFILENAME=${FONTFILENAME:-"default_font"} @@ -24812,7 +16947,7 @@ CPPFLAGS="$CPPFLAGS -DPCBTREEPATH=\\\"$PCBTREEPATH\\\"" # Figure out relative paths -{ $as_echo "$as_me:$LINENO: checking for the bindir to pcblibdir relative path" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the bindir to pcblibdir relative path" >&5 $as_echo_n "checking for the bindir to pcblibdir relative path... " >&6; } for _lcl_i in bindir:PCBLIBDIR:bindir_to_pcblibdir; do _lcl_from=\$`echo "$_lcl_i" | sed 's,:.*$,,'` @@ -24920,7 +17055,7 @@ # if the path contains slashes, also turn backslashes into slashes *) bindir_to_pcblibdir=`echo "$bindir_to_pcblibdir" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;; esac -{ $as_echo "$as_me:$LINENO: result: $bindir_to_pcblibdir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bindir_to_pcblibdir" >&5 $as_echo "$bindir_to_pcblibdir" >&6; } cat >>confdefs.h <<_ACEOF @@ -24928,7 +17063,7 @@ _ACEOF -{ $as_echo "$as_me:$LINENO: checking for the bindir to pcbtreedir relative path" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the bindir to pcbtreedir relative path" >&5 $as_echo_n "checking for the bindir to pcbtreedir relative path... " >&6; } for _lcl_i in bindir:PCBTREEDIR:bindir_to_pcbtreedir; do _lcl_from=\$`echo "$_lcl_i" | sed 's,:.*$,,'` @@ -25036,7 +17171,7 @@ # if the path contains slashes, also turn backslashes into slashes *) bindir_to_pcbtreedir=`echo "$bindir_to_pcbtreedir" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;; esac -{ $as_echo "$as_me:$LINENO: result: $bindir_to_pcbtreedir" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bindir_to_pcbtreedir" >&5 $as_echo "$bindir_to_pcbtreedir" >&6; } cat >>confdefs.h <<_ACEOF @@ -25045,7 +17180,7 @@ -{ $as_echo "$as_me:$LINENO: checking for the bindir to exec_prefix relative path" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the bindir to exec_prefix relative path" >&5 $as_echo_n "checking for the bindir to exec_prefix relative path... " >&6; } for _lcl_i in bindir:exec_prefix:bindir_to_execprefix; do _lcl_from=\$`echo "$_lcl_i" | sed 's,:.*$,,'` @@ -25153,7 +17288,7 @@ # if the path contains slashes, also turn backslashes into slashes *) bindir_to_execprefix=`echo "$bindir_to_execprefix" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;; esac -{ $as_echo "$as_me:$LINENO: result: $bindir_to_execprefix" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bindir_to_execprefix" >&5 $as_echo "$bindir_to_execprefix" >&6; } cat >>confdefs.h <<_ACEOF @@ -25286,6 +17421,8 @@ ac_config_files="$ac_config_files tests/golden/hid_gerber2/Makefile" +ac_config_files="$ac_config_files tests/golden/hid_gerber3/Makefile" + ac_config_files="$ac_config_files tests/golden/hid_png1/Makefile" ac_config_files="$ac_config_files tests/golden/hid_png2/Makefile" @@ -25295,7 +17432,10 @@ ac_config_files="$ac_config_files tests/Makefile" -ac_config_files="$ac_config_files win32/Makefile" +ac_config_files="$ac_config_files gts/Makefile" + + +ac_config_files="$ac_config_files w32/Makefile" cat >confcache <<\_ACEOF @@ -25325,13 +17465,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -25339,8 +17479,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -25363,11 +17503,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -25381,14 +17521,15 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -25404,185 +17545,114 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GIT_VERSION_TRUE}" && test -z "${GIT_VERSION_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"GIT_VERSION\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"GIT_VERSION\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"GIT_VERSION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${CVS_VERSION_TRUE}" && test -z "${CVS_VERSION_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"CVS_VERSION\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"CVS_VERSION\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"CVS_VERSION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GIT_OR_CVS_VERSION_TRUE}" && test -z "${GIT_OR_CVS_VERSION_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"GIT_OR_CVS_VERSION\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"GIT_OR_CVS_VERSION\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"GIT_OR_CVS_VERSION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ac_config_commands="$ac_config_commands po/stamp-it" if test -z "${WITH_TOPOROUTER_TRUE}" && test -z "${WITH_TOPOROUTER_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_TOPOROUTER\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"WITH_TOPOROUTER\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"WITH_TOPOROUTER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WITH_DBUS_TRUE}" && test -z "${WITH_DBUS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_DBUS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"WITH_DBUS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"WITH_DBUS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USE_GL_TRUE}" && test -z "${USE_GL_FALSE}"; then + as_fn_error $? "conditional \"USE_GL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_UPDATE_DESKTOP_DATABASE_TRUE}" && test -z "${ENABLE_UPDATE_DESKTOP_DATABASE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_UPDATE_DESKTOP_DATABASE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ENABLE_UPDATE_DESKTOP_DATABASE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"ENABLE_UPDATE_DESKTOP_DATABASE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_UPDATE_MIME_DATABASE_TRUE}" && test -z "${ENABLE_UPDATE_MIME_DATABASE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_UPDATE_MIME_DATABASE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ENABLE_UPDATE_MIME_DATABASE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${MISSING_LATEX_TRUE}" && test -z "${MISSING_LATEX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MISSING_LATEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MISSING_LATEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"ENABLE_UPDATE_MIME_DATABASE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MISSING_PDFLATEX_TRUE}" && test -z "${MISSING_PDFLATEX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MISSING_PDFLATEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MISSING_PDFLATEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${MISSING_DVIPS_TRUE}" && test -z "${MISSING_DVIPS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MISSING_DVIPS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MISSING_DVIPS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MISSING_PDFLATEX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MISSING_TEXI2DVI_TRUE}" && test -z "${MISSING_TEXI2DVI_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MISSING_TEXI2DVI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MISSING_TEXI2DVI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MISSING_TEXI2DVI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MISSING_PS2PDF_TRUE}" && test -z "${MISSING_PS2PDF_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MISSING_PS2PDF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MISSING_PS2PDF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MISSING_PS2PDF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MISSING_GSCHEM_TRUE}" && test -z "${MISSING_GSCHEM_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MISSING_GSCHEM\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MISSING_GSCHEM\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"MISSING_GSCHEM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_TEST_TOOLS_TRUE}" && test -z "${HAVE_TEST_TOOLS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TEST_TOOLS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_TEST_TOOLS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"HAVE_TEST_TOOLS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${PNG_TRUE}" && test -z "${PNG_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"PNG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"PNG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"PNG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GIF_TRUE}" && test -z "${GIF_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"GIF\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"GIF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"GIF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${PNG_PREVIEW_TRUE}" && test -z "${PNG_PREVIEW_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"PNG_PREVIEW\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"PNG_PREVIEW\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"PNG_PREVIEW\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_PCBLIB_NEWLIB_TRUE}" && test -z "${BUILD_PCBLIB_NEWLIB_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PCBLIB_NEWLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"BUILD_PCBLIB_NEWLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"BUILD_PCBLIB_NEWLIB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DEBUG_BUILD_TRUE}" && test -z "${DEBUG_BUILD_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DEBUG_BUILD\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DEBUG_BUILD\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "conditional \"DEBUG_BUILD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -25592,17 +17662,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -25610,23 +17681,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -25634,7 +17697,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -25645,7 +17714,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -25668,13 +17737,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -25684,15 +17746,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -25704,12 +17766,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -25721,7 +17787,89 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -25735,8 +17883,12 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -25756,76 +17908,25 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -25854,8 +17955,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -25874,10 +18023,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -25892,13 +18041,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pcb $as_me 20100929, which was -generated by GNU Autoconf 2.63. Invocation command line was +This file was extended by pcb $as_me 20110918, which was +generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -25930,13 +18085,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -25955,16 +18112,17 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pcb config.status 20100929 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +pcb config.status 20110918 +configured by $0, generated by GNU Autoconf 2.66, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -26000,6 +18158,8 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -26007,20 +18167,19 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -26028,11 +18187,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -26076,7 +18234,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake < 1.5. + # from automake. eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" @@ -26092,7 +18250,7 @@ case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;; @@ -26144,16 +18302,16 @@ "tests/golden/hid_gcode11/Makefile") CONFIG_FILES="$CONFIG_FILES tests/golden/hid_gcode11/Makefile" ;; "tests/golden/hid_gerber1/Makefile") CONFIG_FILES="$CONFIG_FILES tests/golden/hid_gerber1/Makefile" ;; "tests/golden/hid_gerber2/Makefile") CONFIG_FILES="$CONFIG_FILES tests/golden/hid_gerber2/Makefile" ;; + "tests/golden/hid_gerber3/Makefile") CONFIG_FILES="$CONFIG_FILES tests/golden/hid_gerber3/Makefile" ;; "tests/golden/hid_png1/Makefile") CONFIG_FILES="$CONFIG_FILES tests/golden/hid_png1/Makefile" ;; "tests/golden/hid_png2/Makefile") CONFIG_FILES="$CONFIG_FILES tests/golden/hid_png2/Makefile" ;; "tests/golden/hid_png3/Makefile") CONFIG_FILES="$CONFIG_FILES tests/golden/hid_png3/Makefile" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; + "gts/Makefile") CONFIG_FILES="$CONFIG_FILES gts/Makefile" ;; + "w32/Makefile") CONFIG_FILES="$CONFIG_FILES w32/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -26180,7 +18338,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -26191,11 +18349,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -26203,7 +18357,13 @@ if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' @@ -26220,24 +18380,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -26259,7 +18413,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -26273,7 +18427,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -26326,22 +18480,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -26369,9 +18529,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -26456,9 +18614,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -26471,9 +18627,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -26501,12 +18655,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -26517,7 +18669,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -26530,9 +18682,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -26560,47 +18710,7 @@ q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -26657,7 +18767,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -26667,12 +18776,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -26682,7 +18790,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -26711,26 +18819,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -26741,25 +18845,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -26797,7 +18895,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -26892,54 +18990,14 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done } ;; - "po-directories":C) + "default-1":C) for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" case "$ac_file" in @@ -26959,9 +19017,6 @@ /*) top_srcdir="$ac_given_srcdir" ;; *) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - # Treat a directory as a PO directory if and only if it has a - # POTFILES.in file. This allows packages to have multiple PO - # directories under different names or in different locations. if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" @@ -26975,13 +19030,12 @@ if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES @@ -27054,9 +19108,7 @@ done ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 -$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -27079,15 +19131,12 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -27108,10 +19157,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi @@ -27123,12 +19172,13 @@ expandedXDGDATADIR=`eval "echo $XDGDATADIR"` expandedKDEDATADIR=`eval "echo $KDEDATADIR"` -{ $as_echo "$as_me:$LINENO: result: +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ** Configuration summary for $PACKAGE $VERSION: GUI: $with_gui Printer: $with_printer Exporters: $with_exporters + Coordinate type: $COORD_TYPE Source tree distribution: $pcb_sources Build documentation: $docs_yesno Build toporouter: $enable_toporouter @@ -27140,8 +19190,10 @@ Cross Compiling: $cross_compiling CC: $CC + CXX: $CXX CPPFLAGS: $CPPFLAGS CFLAGS: $CFLAGS + CXXFLAGS: $CXXFLAGS LIBS: $LIBS PCB: $PCB @@ -27152,6 +19204,7 @@ GUI: $with_gui Printer: $with_printer Exporters: $with_exporters + Coordinate type: $COORD_TYPE Source tree distribution: $pcb_sources Build documentation: $docs_yesno Build toporouter: $enable_toporouter @@ -27163,8 +19216,10 @@ Cross Compiling: $cross_compiling CC: $CC + CXX: $CXX CPPFLAGS: $CPPFLAGS CFLAGS: $CFLAGS + CXXFLAGS: $CXXFLAGS LIBS: $LIBS PCB: $PCB diff -Nru pcb-20100929/configure.ac pcb-20110918/configure.ac --- pcb-20100929/configure.ac 2010-09-29 20:38:34.000000000 +0000 +++ pcb-20110918/configure.ac 2011-09-18 19:19:57.000000000 +0000 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([pcb], [20100929]) +AC_INIT([pcb], [20110918]) AC_CONFIG_SRCDIR([src/draw.c]) AC_PREREQ([2.60]) AM_INIT_AUTOMAKE([1.9]) @@ -120,6 +120,7 @@ dnl Checks for programs. AC_PROG_CC +AC_PROG_CXX if test "x$WIN32" = "xyes" ; then AC_CHECK_TOOL(WINDRES, windres, [no]) @@ -263,7 +264,7 @@ AC_MSG_CHECKING([If the compiler accepts -rdynamic]) old_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -rdynamic" -AC_LINK_IFELSE([int main(){}], +AC_LINK_IFELSE([AC_LANG_PROGRAM()], [AC_MSG_RESULT([yes])], [LDFLAGS="$old_LDFLAGS" AC_MSG_RESULT([no]) @@ -388,6 +389,39 @@ fi + +AC_MSG_CHECKING([for whether to use GL drawing]) +AC_ARG_ENABLE([gl], +[ --enable-gl Enable GL drawing (with GTK HID)], +[],[ + case " $with_gui " in + *\ gtk\ *) enable_gl=yes;; + * ) enable_gl=no;; + esac +]) +AC_MSG_RESULT([$enable_gl]) +AM_CONDITIONAL(USE_GL, test x$enable_gl = xyes) + +if test "x$enable_gl" = "xyes"; then + case " $with_gui " in + *\ gtk\ *) ;; + * ) AC_MSG_ERROR([GL drawing enabled but only works with the GTK HID. +Either do not use --enable-gl or enable the gtk HID.]) + ;; + esac + + AX_CHECK_GL + AS_IF([test X$no_gl = Xyes], + [AC_MSG_FAILURE([OpenGL is required.])]) + + AX_CHECK_GLU + AS_IF([test X$no_glu = Xyes], + [AC_MSG_FAILURE([The OpenGL GLU library is required.])]) + + AC_DEFINE([ENABLE_GL], 1, + [Define to 1 if GL support is to be compiled in]) +fi + AC_MSG_CHECKING([for which printer to use]) AC_ARG_WITH([printer], [ --with-printer= Specify the printer: lpr [[default=lpr]]], @@ -533,7 +567,7 @@ fi -AC_PATH_PROGS(WISH, wish wish83 wish8.3 wish80 wish8.0 cygwish83 cygwish80,[none]) +AC_PATH_PROGS(WISH, wish wish85 wish8.5 wish83 wish8.3 wish80 wish8.0 cygwish83 cygwish80,[none]) if test "X$WISH" = "Xnone" ; then AC_MSG_ERROR([Did not find the wish executible. You need to make sure that tcl is installed on your system and that wish is in your path]) @@ -544,15 +578,9 @@ AC_SUBST(GNUM4) AC_DEFINE_UNQUOTED(GNUM4,"$M4",[m4 program used by pcb]) -AC_PATH_PROG(LATEX, latex, notfound) -AM_CONDITIONAL(MISSING_LATEX, test x$LATEX = xnotfound) - AC_PATH_PROG(PDFLATEX, pdflatex, notfound) AM_CONDITIONAL(MISSING_PDFLATEX, test x$PDFLATEX = xnotfound) -AC_PATH_PROG(DVIPS, dvips, notfound) -AM_CONDITIONAL(MISSING_DVIPS, test x$DVIPS = xnotfound) - AC_PATH_PROG(TEXI2DVI, texi2dvi, notfound) AM_CONDITIONAL(MISSING_TEXI2DVI, test x$TEXI2DVI = xnotfound) @@ -564,13 +592,11 @@ AM_CONDITIONAL(MISSING_GSCHEM, test x$GSCHEM = xnotfound) if test "X$docs_yesno" = "Xyes" -a "X$pcb_git_version" = "Xyes" ; then - if test "$LATEX" = "notfound" -o "$PDFLATEX" = "notfound" -o "$DVIPS" = "notfound" -o "$TEXI2DVI" = "notfound" -o "$PS2PDF" = "notfound" ; then + if test "$PDFLATEX" = "notfound" -o "$TEXI2DVI" = "notfound" -o "$PS2PDF" = "notfound" ; then AC_MSG_ERROR([It appears that you are building from a source tree obtained via git but you do not have the required tools installed to build the documentation. Here is a list of tools and the detected values: -LATEX: $LATEX PDFLATEX: $PDFLATEX -DVIPS: $DVIPS TEXI2DVI: $TEXI2DVI PS2PDF: $PS2PDF GSCHEM: $GSCHEM @@ -649,8 +675,8 @@ AC_CHECK_FUNCS(regcomp re_comp) AC_CHECK_FUNCS(logf expf rint) AC_CHECK_FUNCS(vsnprintf) -AC_CHECK_FUNCS(getpwuid gethostname getcwd) -AC_CHECK_FUNCS(random) +AC_CHECK_FUNCS(getpwuid getcwd) +AC_CHECK_FUNCS(rand random) AC_CHECK_FUNCS(stat) AC_CHECK_FUNCS(mkdtemp) @@ -662,6 +688,9 @@ AC_CHECK_FUNCS(realpath canonicalize_file_name) libiberty_NEED_DECLARATION(canonicalize_file_name) +# for pcb_spawnvp in action.c on Windows +AC_CHECK_FUNCS(_spawnvp) + AC_HEADER_STDC AC_CHECK_HEADERS(limits.h locale.h string.h sys/types.h regex.h pwd.h) AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h sys/param.h sys/times.h sys/wait.h) @@ -712,22 +741,24 @@ AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH]) fi - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0, , - [AC_MSG_ERROR([Cannot find gtk+ >= 2.4.0, install it and rerun ./configure + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.0, , + [AC_MSG_ERROR([Cannot find gtk+ >= 2.18.0, install it and rerun ./configure Please review the following errors: $GTK_PKG_ERRORS])] ) GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion` - - # if we are building for gtk >= 2.8.0, we can use gdk_display_warp_pointer() - # otherwise we need XWarpPointer and we'll pull in the required headers with - # gdk/gdkx.h and we'll need to link with X11 - if ! $PKG_CONFIG gtk+-2.0 --atleast-version=2.8.0 ; then - CPPFLAGS="$CFLAGS $GTK_CFLAGS" - AC_CHECK_HEADERS([gdk/gdkx.h]) + GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion` + + if test "x$enable_gl" = "xyes"; then + # Check for GtkGLExt + PKG_CHECK_MODULES(GTKGLEXT, gtkglext-1.0 >= 1.0.0, , [AC_MSG_ERROR([ +*** Required version of gtkglext is not installed - please install first *** +Please review the following errors: +$GTKGLEXT_PKG_ERRORS])] + ) + GTKGLEXT_VER=`$PKG_CONFIG gtkglext-1.0 --modversion` fi - GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion` ;; gcode|nelma|png ) @@ -958,6 +989,22 @@ ;; esac +# ------------- Xinerama ------------------- +have_xinerama=no +AC_CHECK_LIB(Xinerama,XineramaQueryExtension,have_xinerama=yes,have_xinerama=no,$X_LIBS) + +AC_ARG_ENABLE([xinerama], +[ --disable-xinerama Compile and link with Xinerama [default=yes]]) +case "$have_xinerama:$enable_xinerama" in + no:* ) ;; + *:no ) ;; + * ) + X_LIBS="-lXinerama $X_LIBS" + AC_DEFINE([HAVE_XINERAMA], 1, + [Define to 1 if Xinerama is available]) + ;; +esac + # ------------- dmalloc ------------------- dnl dmalloc checks with_dmalloc=no @@ -1012,17 +1059,65 @@ AC_MSG_RESULT([$enable_debug]) AM_CONDITIONAL(DEBUG_BUILD, test x$enable_debug = xyes) +# ------------- mkdir required for win32 compatibility ------------ +# WIN32 mkdir takes only one argument, POSIX takes two. +# #include "misc.h" where mkdir is required. +m4_include([m4/m4_ax_func_mkdir.m4]) +AX_FUNC_MKDIR + +# ------------- Type used for "Coord" type ------------------- + +AC_CHECK_HEADERS(stdint.h) +AC_ARG_ENABLE([coord64], +[ --enable-coord64 Force 64-bit coordinate types], +[],[enable_coord64=no]) +AC_ARG_ENABLE([coord32], +[ --enable-coord32 Force 32-bit coordinate types], +[],[enable_coord32=no]) + +COORDTYPE="long" + +echo "$enable_coord32:$enable_coord64:$ac_cv_header_stdint_h" +case "$enable_coord32:$enable_coord64:$ac_cv_header_stdint_h" in + yes:no:yes ) + COORD_TYPE="int32_t" + COORD_MAX="INT32_MAX" + ;; + no:yes:yes ) + COORD_TYPE="int64_t" + COORD_MAX="INT64_MAX" + ;; + yes:no:no ) + COORD_TYPE="int" + COORD_MAX="INT_MAX" + ;; + no:yes:no ) + COORD_TYPE="long long" + COORD_MAX="LLONG_MAX" + ;; + yes:yes:* ) + AC_MSG_ERROR("*** cannot require both 32 and 64 bit coordinates") + ;; + *:*:* ) + COORD_TYPE="long" + COORD_MAX="LONG_MAX" + ;; +esac +AC_DEFINE_UNQUOTED([COORD_TYPE],[$COORD_TYPE], + [C type for Coordinates]) +AC_DEFINE_UNQUOTED([COORD_MAX],[$COORD_MAX], + [Maximum value of coordinate type]) # ------------- Complete set of CFLAGS and LIBS ------------------- -CFLAGS="$CFLAGS $X_CFLAGS $DBUS_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $CAIRO_CFLAGS" -LIBS="$LIBS $XM_LIBS $DBUS_LIBS $X_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GD_LIBS $INTLLIBS $CAIRO_LIBS" +CFLAGS="$CFLAGS $X_CFLAGS $DBUS_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $CAIRO_CFLAGS $GTKGLEXT_CFLAGS $GLU_CFLAGS $GL_CFLAGS" +LIBS="$LIBS $XM_LIBS $DBUS_LIBS $X_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GD_LIBS $INTLLIBS $CAIRO_LIBS $GTKGLEXT_LIBS $GLU_LIBS $GL_LIBS" # if we have gcc then add -Wall if test "x$GCC" = "xyes"; then # see about adding some extra checks if the compiler takes them - for flag in -Wall -Wdeclaration-after-statement ; do + for flag in -Wall ; do case " ${CFLAGS} " in *\ ${flag}\ *) # flag is already present @@ -1042,6 +1137,50 @@ done fi +CXXFLAGS="$CFLAGS" + +# Now add C-specific flags +if test "x$GCC" = "xyes"; then + # see about adding some extra checks if the compiler takes them + for flag in -Wdeclaration-after-statement ; do + case " ${CFLAGS} " in + *\ ${flag}\ *) + # flag is already present + ;; + *) + AC_MSG_CHECKING([if the compiler accepts ${flag}]) + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS ${flag}" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + CFLAGS="$ac_save_CFLAGS" + ] + ) + ;; + esac + done +fi + +# See if we are building gcc with C++. +AC_ARG_ENABLE(build-with-cxx, +[ --enable-build-with-cxx build with C++ compiler instead of C compiler], +ENABLE_BUILD_WITH_CXX=$enableval, +ENABLE_BUILD_WITH_CXX=no) + +case "$ENABLE_BUILD_WITH_CXX" in + yes) + CC_OR_CXX="$CXX" + CC_OR_CXX_FLAGS="$CXXFLAGS" + ;; + no) + CC_OR_CXX="$CC" + CC_OR_CXX_FLAGS="$CFLAGS" + ;; +esac +AC_SUBST(CC_OR_CXX) +AC_SUBST(CC_OR_CXX_FLAGS) + # font filename FONTFILENAME=${FONTFILENAME:-"default_font"} AC_SUBST(FONTFILENAME) @@ -1172,13 +1311,17 @@ AC_CONFIG_FILES(tests/golden/hid_gcode11/Makefile) AC_CONFIG_FILES(tests/golden/hid_gerber1/Makefile) AC_CONFIG_FILES(tests/golden/hid_gerber2/Makefile) +AC_CONFIG_FILES(tests/golden/hid_gerber3/Makefile) AC_CONFIG_FILES(tests/golden/hid_png1/Makefile) AC_CONFIG_FILES(tests/golden/hid_png2/Makefile) AC_CONFIG_FILES(tests/golden/hid_png3/Makefile) AC_CONFIG_FILES(tests/Makefile) +dnl GTS 0.7.6 - http://gts.sourceforge.net/ +AC_CONFIG_FILES(gts/Makefile) + dnl win32 build scripts -AC_CONFIG_FILES(win32/Makefile) +AC_CONFIG_FILES(w32/Makefile) AC_OUTPUT @@ -1195,6 +1338,7 @@ GUI: $with_gui Printer: $with_printer Exporters: $with_exporters + Coordinate type: $COORD_TYPE Source tree distribution: $pcb_sources Build documentation: $docs_yesno Build toporouter: $enable_toporouter @@ -1206,8 +1350,10 @@ Cross Compiling: $cross_compiling CC: $CC + CXX: $CXX CPPFLAGS: $CPPFLAGS CFLAGS: $CFLAGS + CXXFLAGS: $CXXFLAGS LIBS: $LIBS PCB: $PCB diff -Nru pcb-20100929/data/Makefile.in pcb-20110918/data/Makefile.in --- pcb-20100929/data/Makefile.in 2010-09-29 20:52:38.000000000 +0000 +++ pcb-20110918/data/Makefile.in 2011-09-18 20:06:19.000000000 +0000 @@ -37,7 +37,25 @@ subdir = data DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ + $(top_srcdir)/m4/ax_check_glu.m4 \ + $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ + $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ + $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ + $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/m4_ax_func_mkdir.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -87,11 +105,15 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CC_OR_CXX = @CC_OR_CXX@ +CC_OR_CXX_FLAGS = @CC_OR_CXX_FLAGS@ CFLAGS = @CFLAGS@ -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CONVERT = @CONVERT@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -99,7 +121,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DOC = @DOC@ -DVIPS = @DVIPS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -109,24 +130,26 @@ GDLIB_CONFIG = @GDLIB_CONFIG@ GENCAT = @GENCAT@ GERBV = @GERBV@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GL_CFLAGS = @GL_CFLAGS@ +GL_LIBS = @GL_LIBS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GNUM4 = @GNUM4@ GREP = @GREP@ GSCHEM = @GSCHEM@ +GTKGLEXT_CFLAGS = @GTKGLEXT_CFLAGS@ +GTKGLEXT_LIBS = @GTKGLEXT_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTK_UPDATE_ICON_CACHE_BIN = @GTK_UPDATE_ICON_CACHE_BIN@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ HAVE_SNPRINTF = @HAVE_SNPRINTF@ -HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WPRINTF = @HAVE_WPRINTF@ HIDLIBS = @HIDLIBS@ HIDLIST = @HIDLIST@ @@ -150,10 +173,8 @@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ KDEDATADIR = @KDEDATADIR@ KPSEWHICH = @KPSEWHICH@ -LATEX = @LATEX@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -161,27 +182,19 @@ LEX_PATH = @LEX_PATH@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ LIBRARYFILENAME = @LIBRARYFILENAME@ LIBS = @LIBS@ -LIBTHREAD = @LIBTHREAD@ -LTLIBC = @LTLIBC@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ M4 = @M4@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINFO = @MKINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -189,6 +202,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCB = @PCB@ @@ -198,11 +212,16 @@ PDFLATEX = @PDFLATEX@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PPMTOWINICON = @PPMTOWINICON@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PS2PDF = @PS2PDF@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SETENV = @SETENV@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -217,12 +236,8 @@ WIN32 = @WIN32@ WINDRES = @WINDRES@ WISH = @WISH@ -WOE32 = @WOE32@ -WOE32DLL = @WOE32DLL@ XDGDATADIR = @XDGDATADIR@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ XPMTOPPM = @XPMTOPPM@ X_CFLAGS = @X_CFLAGS@ @@ -237,11 +252,13 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ diff -Nru pcb-20100929/data/pcb.desktop pcb-20110918/data/pcb.desktop --- pcb-20100929/data/pcb.desktop 2010-09-29 20:55:08.000000000 +0000 +++ pcb-20110918/data/pcb.desktop 2011-09-18 20:08:47.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Version=1.0 Name=PCB Designer +Name[nl]=PCB Ontwerper Name[ru]=Редактор PCB GenericName=PCB Design +GenericName[nl]=PCB Ontwerp GenericName[ru]=Проект PCB Comment=Create and edit printed circuit board designs +Comment[nl]=Creer en bewerk gedrukte bedrading ontwerpen Comment[ru]=Создание и редактирование проектов печатных плат Type=Application Exec=pcb %f diff -Nru pcb-20100929/data/pcb.xml pcb-20110918/data/pcb.xml --- pcb-20100929/data/pcb.xml 2010-09-29 20:55:09.000000000 +0000 +++ pcb-20110918/data/pcb.xml 2011-09-18 20:08:47.000000000 +0000 @@ -3,6 +3,7 @@ PCB layout + PCB opmaak PCB траÑÑировка @@ -12,6 +13,7 @@ PCB footprint + PCB voetafdruk PCB поÑадочное меÑто @@ -21,12 +23,14 @@ PCB netlist + PCB netlijst PCB ÑпиÑок Ñоединений Gerber file + Gerber bestand Gerber-файл @@ -36,6 +40,7 @@ Excellon drill file + Excellon boor bestand Файл Ñверловки Excellon diff -Nru pcb-20100929/debian/changelog pcb-20110918/debian/changelog --- pcb-20100929/debian/changelog 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/changelog 2011-12-20 18:55:22.000000000 +0000 @@ -1,3 +1,51 @@ +pcb (20110918-4) unstable; urgency=low + + * Close 644139 in previous changelog entry + * Added disable_hid_png3_test.diff to disable hid_png3 test + (Closes: #642923) + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Tue, 20 Dec 2011 20:45:37 +0200 + +pcb (20110918-3) unstable; urgency=low + + * debian/rules: Remove needlessly installed header file. (Closes: #644139) + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Mon, 03 Oct 2011 21:40:56 +0200 + +pcb (20110918-2) unstable; urgency=low + + * Added default_GtkFileChooser_cwd.diff patch to default the GTK file + chooser dialogs to cwd (Closes: #642060) + * debian/control: Remove ${shlib:Depends} from pcb-common's dependencies. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Wed, 21 Sep 2011 17:12:08 +0200 + +pcb (20110918-1) unstable; urgency=low + + * New upstream release. + * debian/watch: Added URL for gEDA website + * debian/control: + + Bumped Standards-Version to 3.9.2 + + Replaced Build-Dep on libgtk2.0-dev & libglib2.0-dev with + libgtkglext1-dev + * Bumped compat level 8 + * debian/copyright: + + Updated copyright years + + Updated copyright format + * debian/rules: + + Remove needlessly installed static library before installing common + files + + Added override for dh_auto_test to run tests in build dirs + * Added fix_typo.diff patch to fix a typo + * Added fix_pan_action.diff patch to fix pan action to stop after button + release outside window master (Closes: #562641) + * debian/pcb-{gtk,lesstiff}.lintian-overrides: Added overrides for false + spelling-error tags + * Added imagemagick & gerbv to Build-Deps to enable test suite + * Added pcbtest_paths.diff patch to fix path for lib/pcblib-newlib + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Wed, 21 Sep 2011 12:21:08 +0200 + pcb (20100929-2) unstable; urgency=low * Install PDF version of refcard instead of the DVI, as the PDF got diff -Nru pcb-20100929/debian/compat pcb-20110918/debian/compat --- pcb-20100929/debian/compat 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/compat 2011-12-20 18:55:22.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru pcb-20100929/debian/control pcb-20110918/debian/control --- pcb-20100929/debian/control 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/control 2011-12-20 18:55:22.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian Electronics Team Uploaders: Hamish Moffatt , Wesley J. Landaker , Ramakrishnan Muthukrishnan , أحمد المحمودي (Ahmed El-Mahmoudy) -Build-Depends: debhelper (>= 7.4.3~), bison, flex, libgtk2.0-dev, libglib2.0-dev, tk8.5, libgd2-xpm-dev | libgd2-dev, libdbus-1-dev, lesstif2-dev, libxmu-dev, libxml-parser-perl, intltool -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 8), bison, flex, libgtkglext1-dev, tk8.5, libgd2-xpm-dev | libgd2-dev, libdbus-1-dev, lesstif2-dev, libxmu-dev, libxml-parser-perl, intltool, imagemagick, gerbv +Standards-Version: 3.9.2 DM-Upload-Allowed: yes Homepage: http://pcb.gpleda.org/ Vcs-Git: git://git.debian.org/git/pkg-electronics/pcb.git @@ -24,7 +24,7 @@ Package: pcb-common Architecture: all Replaces: pcb -Depends: ${misc:Depends}, ${shlibs:Depends}, m4, tk8.5 | wish, tcl8.5 | tclsh, pcb-gtk | pcb-lesstif +Depends: ${misc:Depends}, m4, tk8.5 | wish, tcl8.5 | tclsh, pcb-gtk | pcb-lesstif Recommends: extra-xdg-menus Description: printed circuit board (pcb) design program - common files PCB is an interactive printed circuit board editor for the X11 window diff -Nru pcb-20100929/debian/copyright pcb-20110918/debian/copyright --- pcb-20100929/debian/copyright 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/copyright 2011-12-20 18:55:22.000000000 +0000 @@ -1,38 +1,44 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: pcb -Maintainer: harry eaton +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174 +Upstream-Name: pcb +Upstream-Contact: harry eaton Source: http://pcb.gpleda.org -Copyright: 1994-1997, Thomas Nau - 1998-2007, harry eaton - 2001, C. Scott Ananian - 2003-2008, DJ Delorie - 2003-2008, Dan McMahill +Files: * +Copyright: 1994-1997,2010 Thomas Nau + 1998-2007,2009 harry eaton + 2001 C. Scott Ananian + 2003-2008 DJ Delorie + 2009-2011 PCB Contributers (See ChangeLog for details) + 2009 Anthony Blake + 2011 Andrew Poelstra + 2010 Alberto Maccioni + 2003-2010 Dan McMahill License: GPL-2+ -On Debian systems, the complete text of the GNU GPL2 licenses -can be found at `/usr/share/common-licenses/GPL-2'. - Files: debian/* -Copyright: 2003-2008, Hamish Moffatt - 1996, Michael Mattice - 1997-1999, Hartmut Koptein - 2009, أحمد المحمودي (Ahmed El-Mahmoudy) +Copyright: 2003-2008 Hamish Moffatt + 1996 Michael Mattice + 1997-1999 Hartmut Koptein + 2009-2011 أحمد المحمودي (Ahmed El-Mahmoudy) License: GPL-2+ License: GPL-2+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. + . + On Debian systems, the complete text of the GNU GPL2 licenses can be found at + `/usr/share/common-licenses/GPL-2'. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. diff -Nru pcb-20100929/debian/patches/default_GtkFileChooser_cwd.diff pcb-20110918/debian/patches/default_GtkFileChooser_cwd.diff --- pcb-20100929/debian/patches/default_GtkFileChooser_cwd.diff 1970-01-01 00:00:00.000000000 +0000 +++ pcb-20110918/debian/patches/default_GtkFileChooser_cwd.diff 2011-12-20 18:55:22.000000000 +0000 @@ -0,0 +1,55 @@ +Description: Set default path in GTK file choosers to cwd +Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Bug: https://bugs.launchpad.net/pcb/+bug/855621 +Bug-Debian: http://bugs.debian.org/642060 +Forwarded: https://bugs.launchpad.net/pcb/+bug/855621/+attachment/2436146/+files/default_GtkFileChooser_cwd.diff + +--- a/src/hid/gtk/gtkhid-main.c ++++ b/src/hid/gtk/gtkhid-main.c +@@ -11,6 +11,7 @@ + #endif + #include + #include ++#include + + + #include "action.h" +@@ -1230,6 +1231,13 @@ + static gchar *current_layout_dir = NULL; + static gchar *current_netlist_dir = NULL; + ++ if(!current_element_dir) ++ current_element_dir = get_current_dir_name(); ++ if(!current_layout_dir) ++ current_layout_dir = get_current_dir_name(); ++ if(!current_netlist_dir) ++ current_netlist_dir = get_current_dir_name(); ++ + /* we've been given the file name */ + if (argc > 1) + return hid_actionv ("LoadFrom", argc, argv); +@@ -1303,6 +1311,9 @@ + + static gchar *current_dir = NULL; + ++ if(!current_dir) ++ current_dir = get_current_dir_name(); ++ + if (argc > 1) + return hid_actionv ("SaveTo", argc, argv); + +@@ -1986,6 +1997,9 @@ + static int I_am_recursing = 0; + int rv; + ++ if(!current_layout_dir) ++ current_layout_dir = get_current_dir_name(); ++ + if (I_am_recursing) + return 1; + +--- a/po/POTFILES.skip ++++ b/po/POTFILES.skip +@@ -1 +1,2 @@ + .pc/fix_pan_action.diff/src/hid/gtk/gtkhid-main.c ++.pc/default_GtkFileChooser_cwd.diff/src/hid/gtk/gtkhid-main.c diff -Nru pcb-20100929/debian/patches/disable_hid_png3_test.diff pcb-20110918/debian/patches/disable_hid_png3_test.diff --- pcb-20100929/debian/patches/disable_hid_png3_test.diff 1970-01-01 00:00:00.000000000 +0000 +++ pcb-20110918/debian/patches/disable_hid_png3_test.diff 2011-12-20 18:55:22.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Disable hid_png3 test + According to upstream, the problem is in the hid_png3 test +Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Forwarded: not-needed +Bug: https://bugs.launchpad.net/bugs/860037 +Bug-Debian: http://bugs.debian.org/642923 +--- a/tests/tests.list ++++ b/tests/tests.list +@@ -161,6 +161,6 @@ + # + hid_png1 | gerber_oneline.pcb | png | | | png:gerber_oneline.png + hid_png2 | gerber_oneline.pcb | png | --outfile myfile.png | | png:myfile.png +-hid_png3 | gerber_oneline.pcb | png | --dpi 300 | | png:gerber_oneline.png ++#hid_png3 | gerber_oneline.pcb | png | --dpi 300 | | png:gerber_oneline.png + # + diff -Nru pcb-20100929/debian/patches/fix_pan_action.diff pcb-20110918/debian/patches/fix_pan_action.diff --- pcb-20100929/debian/patches/fix_pan_action.diff 1970-01-01 00:00:00.000000000 +0000 +++ pcb-20110918/debian/patches/fix_pan_action.diff 2011-12-20 18:55:22.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Fix Pan action to stop after button release outside window master + Previously, we required in-view coordinates to stop and start the + pan-action, and when the button was released outside the viewport, + the code was querying the user to click at a particular location. + + Since the pan action doesn't even use the passed in coordinates, + simply remove the requirement for the x-y coordinates from this + action. +Origin: http://git.gpleda.org/?p=pcb.git;a=commit;h=ed9a9d0cd9d054e6fc4a075ec1b8d9a12f1cb376 +Author: Peter Clifton [Mon, 19 Sep 2011 10:16:49 +0000 (11:16 +0100)] +Bug: https://launchpad.net/bugs/699307 +Bug-Debian: http://bugs.debian.org/562641 + +--- a/src/hid/gtk/gtkhid-main.c ++++ b/src/hid/gtk/gtkhid-main.c +@@ -2030,7 +2030,7 @@ + {"LayerGroupsChanged", 0, LayerGroupsChanged}, + {"LibraryChanged", 0, LibraryChanged}, + {"Load", 0, Load}, +- {"Pan", N_("Click on a place to pan"), PanAction, pan_help, pan_syntax}, ++ {"Pan", 0, PanAction, pan_help, pan_syntax}, + {"PCBChanged", 0, PCBChanged}, + {"PointCursor", 0, PointCursor}, + {"Popup", 0, Popup, popup_help, popup_syntax}, +--- /dev/null ++++ b/po/POTFILES.skip +@@ -0,0 +1 @@ ++.pc/fix_pan_action.diff/src/hid/gtk/gtkhid-main.c diff -Nru pcb-20100929/debian/patches/fix_typo.diff pcb-20110918/debian/patches/fix_typo.diff --- pcb-20100929/debian/patches/fix_typo.diff 1970-01-01 00:00:00.000000000 +0000 +++ pcb-20110918/debian/patches/fix_typo.diff 2011-12-20 18:55:22.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix typo (recieved -> received) +Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Bug: https://bugs.launchpad.net/pcb/+bug/855398 +Forwarded: https://bugs.launchpad.net/pcb/+bug/855398/+attachment/2435156/+files/fix_typo.diff + +--- a/src/hid/common/hidgl.c ++++ b/src/hid/common/hidgl.c +@@ -521,7 +521,7 @@ + } + } + else +- printf ("Vertex recieved with unknown type\n"); ++ printf ("Vertex received with unknown type\n"); + } + + void diff -Nru pcb-20100929/debian/patches/outdated_config.diff pcb-20110918/debian/patches/outdated_config.diff --- pcb-20100929/debian/patches/outdated_config.diff 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/patches/outdated_config.diff 2011-12-20 18:55:22.000000000 +0000 @@ -1,5 +1,5 @@ Description: Patch config.{sub,guess} to call their up-to-date versions. -Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Author: أحمد المحمودي (Ahmed El-Mahmoudy) --- a/config.guess +++ b/config.guess @@ -1,4 +1,8 @@ diff -Nru pcb-20100929/debian/patches/pcbtest_paths.diff pcb-20110918/debian/patches/pcbtest_paths.diff --- pcb-20100929/debian/patches/pcbtest_paths.diff 1970-01-01 00:00:00.000000000 +0000 +++ pcb-20110918/debian/patches/pcbtest_paths.diff 2011-12-20 18:55:22.000000000 +0000 @@ -0,0 +1,15 @@ +Description: lib/pcblib-newlib is in TOPSRCDIR not in TOP_BUILDDIR +Author: أحمد المحمودي (Ahmed El-Mahmoudy) +Bug: https://bugs.launchpad.net/pcb/+bug/855405 +Forwarded: https://bugs.launchpad.net/pcb/+bug/855405/+attachment/2435173/+files/pcbtest_paths.diff +--- a/src/pcbtest.sh.in ++++ b/src/pcbtest.sh.in +@@ -37,7 +37,7 @@ + # Use --g-fatal-warnings with the gtk HID to cause gtk-WARNING's to + # abort. + +-TEST_PATHS="--lib-path @TOP_BUILDDIR@/lib --lib-newlib @TOPSRCDIR@/newlib:@TOP_BUILDDIR@/lib/pcblib-newlib --element-path @TOP_BUILDDIR@/lib --font-path @TOPSRCDIR@/src" ++TEST_PATHS="--lib-path @TOP_BUILDDIR@/lib --lib-newlib @TOPSRCDIR@/newlib:@TOPSRCDIR@/lib/pcblib-newlib --element-path @TOP_BUILDDIR@/lib --font-path @TOPSRCDIR@/src" + TEST_CMDS="--lib-command-dir @TOP_BUILDDIR@/lib" + + # note: To do command line exporting, pcb requires the "-x " command to appear first. For example diff -Nru pcb-20100929/debian/patches/series pcb-20110918/debian/patches/series --- pcb-20100929/debian/patches/series 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/patches/series 2011-12-20 18:55:22.000000000 +0000 @@ -1 +1,6 @@ +fix_typo.diff outdated_config.diff +fix_pan_action.diff +pcbtest_paths.diff +default_GtkFileChooser_cwd.diff +disable_hid_png3_test.diff diff -Nru pcb-20100929/debian/pcb-common.lintian-overrides pcb-20110918/debian/pcb-common.lintian-overrides --- pcb-20100929/debian/pcb-common.lintian-overrides 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/pcb-common.lintian-overrides 2011-12-20 18:55:22.000000000 +0000 @@ -1,3 +1,3 @@ # /usr/bin/pcb is an alternative installed by postinst script of either pcb-gtk # or pcb-lesstiff -pcb-common: desktop-command-not-in-package /usr/share/applications/pcb.desktop pcb +pcb-common: desktop-command-not-in-package usr/share/applications/pcb.desktop pcb diff -Nru pcb-20100929/debian/pcb-gtk.lintian-overrides pcb-20110918/debian/pcb-gtk.lintian-overrides --- pcb-20100929/debian/pcb-gtk.lintian-overrides 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/pcb-gtk.lintian-overrides 2011-12-20 18:55:22.000000000 +0000 @@ -1,2 +1,4 @@ # pcb.xpm is provided by pcb-common, which is in pcb-gtk's Depends pcb-gtk: menu-icon-missing pcb.xpm +# Not a spelling mistake, ang is for angle +pcb-gtk: spelling-error-in-binary usr/bin/pcb-gtk ang and diff -Nru pcb-20100929/debian/pcb-lesstif.lintian-overrides pcb-20110918/debian/pcb-lesstif.lintian-overrides --- pcb-20100929/debian/pcb-lesstif.lintian-overrides 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/pcb-lesstif.lintian-overrides 2011-12-20 18:55:22.000000000 +0000 @@ -1,2 +1,4 @@ # pcb.xpm is provided by pcb-common, which is in pcb-lesstif's Depends pcb-lesstif: menu-icon-missing pcb.xpm +# Not a spelling mistake, ang is for angle +pcb-lesstif: spelling-error-in-binary usr/bin/pcb-lesstif ang and diff -Nru pcb-20100929/debian/rules pcb-20110918/debian/rules --- pcb-20100929/debian/rules 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/rules 2011-12-20 18:55:22.000000000 +0000 @@ -18,6 +18,10 @@ dh_auto_build --builddirectory build_gtk dh_auto_build --builddirectory build_lesstif +override_dh_auto_test: + dh_auto_test --builddirectory build_gtk + dh_auto_test --builddirectory build_lesstif + override_dh_auto_install: dh_auto_install --builddirectory build_gtk @@ -26,6 +30,10 @@ dh_auto_clean --builddirectory build_lesstif override_dh_install: + # Remove needlessly installed static library and header file before + # installing common files: + rm -rf $(CURDIR)/debian/tmp/usr/lib + rm -rf $(CURDIR)/debian/tmp/usr/include dh_install -Xusr/bin -Xusr/share/pcb- -Xusr/share/doc -Xexamples -Xtutorial -Xusr/share/info # Install pcb-gtk binary: diff -Nru pcb-20100929/debian/watch pcb-20110918/debian/watch --- pcb-20100929/debian/watch 2010-11-08 05:34:11.000000000 +0000 +++ pcb-20110918/debian/watch 2011-12-20 18:55:22.000000000 +0000 @@ -1,2 +1,3 @@ version=3 http://sf.net/pcb/pcb-(.*)\.tar\.gz +http://geda.seul.org/dist/pcb-(.*)\.tar\.gz diff -Nru pcb-20100929/doc/actions.texi pcb-20110918/doc/actions.texi --- pcb-20100929/doc/actions.texi 2010-09-29 20:55:25.000000000 +0000 +++ pcb-20110918/doc/actions.texi 2011-09-18 20:09:04.000000000 +0000 @@ -1,5 +1,5 @@ @c key actions -@c ./../src/action.c 222 +@c ./../src/action.c 225 Many actions take a @code{delta} parameter as the last parameter, which is an amount to change something. That @code{delta} may include @@ -18,7 +18,7 @@ Actions which take a @code{delta} parameter which do not accept all these options will specify what they do take. -@c ./../src/action.c 226 +@c ./../src/action.c 229 @macro pinshapes @@ -46,7 +46,7 @@ @end macro -@c ./../src/action.c 224 +@c ./../src/action.c 227 Many actions act on indicated objects on the board. They will have parameters like @code{ToggleObject} or @code{SelectedVias} to indicate @@ -113,37 +113,37 @@ * DisableVendor Action:: Disables automatic drill size mapping. * DisperseElements Action:: Disperses elements. * Display Action:: Several display-related actions. -* djopt Action:: Perform various optimizations on the current board +* djopt Action:: Perform various optimizations on the current board. * DRC Action:: Invoke the DRC check. * DumpLibrary Action:: Display the entire contents of the libraries. * elementlist Action:: Adds the given element if it doesn't already exist. -* elementsetattr Action:: Sets or clears an element-specific attribute +* elementsetattr Action:: Sets or clears an element-specific attribute. * EnableVendor Action:: Enables automatic drill size mapping. -* execcommand Action:: Runs a command +* execcommand Action:: Runs a command. * ExecuteFile Action:: Run actions from the given file. * Flip Action:: Flip an element to the opposite side of the board. -* FontEdit Action:: Convert the current font to a PCB for editing -* FontSave Action:: Convert the current PCB back to a font +* FontEdit Action:: Convert the current font to a PCB for editing. +* FontSave Action:: Convert the current PCB back to a font. * FreeRotateBuffer Action:: Rotates the current paste buffer contents by the specified angle. The angle is given in degrees. If no angle is given, the user is prompted for one. * GlobalPuller Action:: Pull all traces tight. * h Action:: Print a help message for commands. -* Import Action:: Import schematics +* Import Action:: Import schematics. * l Action:: Loads layout data. * le Action:: Loads an element into the current buffer. -* LoadFootprint Action:: Loads a single footprint by name +* LoadFootprint Action:: Loads a single footprint by name. * LoadFrom Action:: Load layout data from a file. * LoadVendorFrom Action:: Loads the specified vendor resource file. * m Action:: Loads a layout into the current buffer. -* MarkCrosshair Action:: Set/Reset the Crosshair mark +* MarkCrosshair Action:: Set/Reset the Crosshair mark. * Message Action:: Writes a message to the log window. * MinClearGap Action:: Ensures that polygons are a minimum distance from objects. * MinMaskGap Action:: Ensures the mask is a minimum distance from pins and pads. * Mode Action:: Change or use the tool mode. * MorphPolygon Action:: Converts dead polygon islands into separate polygons. -* MoveLayer Action:: Moves/Creates/Deletes Layers +* MoveLayer Action:: Moves/Creates/Deletes Layers. * MoveObject Action:: Moves the object under the crosshair. * MoveToCurrentLayer Action:: Moves objects to the current layer. * Netlist Action:: Perform various actions on netlists. @@ -167,7 +167,7 @@ * s Action:: Saves layout data. * SaveSettings Action:: Saves settings. * SaveTo Action:: Saves data to a file. -* Select Action:: Toggles or sets the selection +* Select Action:: Toggles or sets the selection. * SetFlag Action:: Sets flags on objects. * SetOctagon Action:: Sets the octagon-flag of objects. * SetSame Action:: Sets current layer and sizes to match indicated item. @@ -184,7 +184,7 @@ * ToggleVendor Action:: Toggles the state of automatic drill size mapping. * Undo Action:: Undo recent changes. * UnloadVendor Action:: Unloads the current vendor drill mapping table. -* Unselect Action:: unselects the object at the pointer location or the specified objects +* Unselect Action:: Unselects the object at the pointer location or the specified objects. * w Action:: Saves layout data. * wq Action:: Saves the layout data and quits. @end menu @@ -197,7 +197,7 @@ @end cartouche Add one or more rat lines to the board. -@c ./../src/action.c 3334 +@c ./../src/action.c 3310 @table @code @@ -241,7 +241,7 @@ @end cartouche Save or restore the undo serial number. -@c ./../src/action.c 1719 +@c ./../src/action.c 1720 This action allows making multiple-action bindings into an atomic operation that will be undone by a single Undo command. For example, @@ -283,7 +283,7 @@ Let the user edit the attributes of the layout, current or given layer, or selected element. -@c ./../src/action.c 6800 +@c ./../src/action.c 6761 This just pops up a dialog letting the user edit the attributes of the pcb, an element, or a layer. @@ -298,7 +298,7 @@ @end cartouche Auto-place selected components. -@c ./../src/action.c 3481 +@c ./../src/action.c 3450 Attempts to re-arrange the selected components such that the nets connecting them are minimized. Note that you cannot undo this. @@ -313,7 +313,7 @@ @end cartouche Auto-route some or all rat lines. -@c ./../src/action.c 3504 +@c ./../src/action.c 3471 @table @code @@ -347,7 +347,7 @@ @end cartouche Changes the clearance size of objects. -@c ./../src/action.c 3722 +@c ./../src/action.c 3686 If the solder mask is currently showing, this action changes the solder mask clearance. If the mask is not showing, this action @@ -364,7 +364,7 @@ @end cartouche Changes the drilling hole size of objects. -@c ./../src/action.c 3664 +@c ./../src/action.c 3630 @node ChangeFlag Action @@ -377,11 +377,11 @@ ChangeFlag(SelectedPads|SelectedTexts|SelectedNames, flag, value) ChangeFlag(SelectedElements, flag, value) flag = square | octagon | thermal | join -"``value = 0 | 1@end format +value = 0 | 1@end format @end cartouche Sets or clears flags on objects. -@c ./../src/action.c 5808 +@c ./../src/action.c 5750 Toggles the given flag on the indicated object(s). The flag may be one of the flags listed above (square, octagon, thermal, join). The @@ -398,7 +398,7 @@ @end cartouche Changes the hole flag of objects. -@c ./../src/action.c 4628 +@c ./../src/action.c 4571 The "hole flag" of a via determines whether the via is a plated-through hole (not set), or an unplated hole (set). @@ -413,7 +413,7 @@ @end cartouche Changes the join (clearance through polygons) of objects. -@c ./../src/action.c 4242 +@c ./../src/action.c 4199 The join flag determines whether a line or arc, drawn to intersect a polygon, electrically connects to the polygon or not. When joined, @@ -428,11 +428,11 @@ @cartouche @format ChangeName(Object) -"``ChangeName(Layout|Layer)@end format +ChangeName(Layout|Layer)@end format @end cartouche Sets the name of objects. -@c ./../src/action.c 4045 +@c ./../src/action.c 4005 @table @code @@ -458,7 +458,7 @@ @end cartouche Changes the octagon-flag of pins and vias. -@c ./../src/action.c 4454 +@c ./../src/action.c 4403 @pinshapes @@ -472,7 +472,7 @@ @end cartouche Changes the no paste flag of objects. -@c ./../src/action.c 4670 +@c ./../src/action.c 4611 The "no paste flag" of a pad determines whether the solderpaste stencil will have an opening for the pad (no set) or if there wil be @@ -489,7 +489,7 @@ @end cartouche Sets the name of a specific pin on a specific element. -@c ./../src/action.c 3964 +@c ./../src/action.c 3924 This can be especially useful for annotating pin names from a schematic to the layout without requiring knowledge of the pcb file @@ -513,7 +513,7 @@ @end cartouche Changes the size of objects. -@c ./../src/action.c 3575 +@c ./../src/action.c 3543 For lines and arcs, this changes the width. For pins and vias, this changes the overall diameter of the copper annulus. For pads, this @@ -533,7 +533,7 @@ @end cartouche Changes the square flag of pins and pads. -@c ./../src/action.c 4295 +@c ./../src/action.c 4250 Note that @code{Pins} means both pins and pads. @@ -550,7 +550,7 @@ @end cartouche Clears the octagon-flag of pins and vias. -@c ./../src/action.c 4570 +@c ./../src/action.c 4515 @pinshapes @@ -564,7 +564,7 @@ @end cartouche Clears the square-flag of pins and pads. -@c ./../src/action.c 4401 +@c ./../src/action.c 4352 Note that @code{Pins} means pins and pads. @@ -584,7 +584,7 @@ @end cartouche Clears flags on objects. -@c ./../src/action.c 5791 +@c ./../src/action.c 5733 Turns the given flag off, regardless of its previous setting. See @code{ChangeFlag}. @@ -603,7 +603,7 @@ @end cartouche Searches connections of the object at the cursor position. -@c ./../src/action.c 2145 +@c ./../src/action.c 2093 Connections found with this action will be highlighted in the ``connected-color'' color and will have the ``found'' flag set. @@ -622,10 +622,6 @@ @item Reset All ``found'' objects are marked ``not found''. -@item Measure -The net under the cursor is found and measured (the lengths of all -line segments are added together) - @end table @@ -635,11 +631,11 @@ @cartouche @format Delete(Object|Selected) -Delete(AllRats|SelectedRats) ;@end format +Delete(AllRats|SelectedRats)@end format @end cartouche Delete stuff. -@c ./../src/action.c 3398 +@c ./../src/action.c 3371 @node DeleteRats Action @@ -651,7 +647,7 @@ @end cartouche Delete rat lines. -@c ./../src/action.c 3447 +@c ./../src/action.c 3418 @node DisableVendor Action @@ -683,7 +679,7 @@ @end cartouche Disperses elements. -@c ./../src/action.c 2191 +@c ./../src/action.c 2146 Normally this is used when starting a board, by selecting all elements and then dispersing them. This scatters the elements around the board @@ -705,12 +701,11 @@ Display(ToggleThindraw|ToggleThindrawPoly|ToggleOrthoMove|ToggleLocalRef) Display(ToggleCheckPlanes|ToggleShowDRC|ToggleAutoDRC) Display(ToggleLiveRoute|LockNames|OnlyNames) -Display(Pinout|PinOrPadName) -"``Display(Scroll, Direction)@end format +Display(Pinout|PinOrPadName)@end format @end cartouche Several display-related actions. -@c ./../src/action.c 2309 +@c ./../src/action.c 2262 @table @code @@ -788,6 +783,16 @@ @item ToggleName Selects whether the pinouts show the pin names or the pin numbers. +@item ToggleLockNames +If set, text will ignore left mouse clicks and actions that work on +objects under the mouse. You can still select text with a lasso (left +mouse drag) and perform actions on the selection. + +@item ToggleOnlyNames +If set, only text will be sensitive for mouse clicks and actions that +work on objects under the mouse. You can still select other objects +with a lasso (left mouse drag) and perform actions on the selection. + @item ToggleMask Turns the solder mask on or off. @@ -804,8 +809,7 @@ @item ToggleGrid Resets the origin of the current grid to be wherever the mouse pointer is (not where the crosshair currently is). If you provide two numbers -after this, the origin is set to that coordinate. The numbers are in -PCB internal units, currently 1/100 mil. +after this, the origin is set to that coordinate. @item Grid Toggles whether the grid is displayed or not. @@ -819,11 +823,6 @@ displayed. If the cursor is over an element, all of its pins and pads are affected. -@item Step -Steps the crosshair in the given direction, with 1=down/left, 2=down, -etc, according to the numeric keypad layout. If amount is not given, -the crosshair steps along the grid. - @end table @@ -834,11 +833,11 @@ @format djopt(debumpify|unjaggy|simple|vianudge|viatrim|orthopull) djopt(auto) - all of the above -"``djopt(miter)@end format +djopt(miter)@end format @end cartouche -Perform various optimizations on the current board -@c ./../src/djopt.c 2908 +Perform various optimizations on the current board. +@c ./../src/djopt.c 2853 The different types of optimizations change your board in order to reduce the total trace length and via count. @@ -896,7 +895,7 @@ @end cartouche Invoke the DRC check. -@c ./../src/action.c 1754 +@c ./../src/action.c 1755 Note that the design rule check uses the current board rule settings, not the current style settings. @@ -911,7 +910,7 @@ @end cartouche Display the entire contents of the libraries. -@c ./../src/action.c 1794 +@c ./../src/action.c 1791 @@ -924,7 +923,7 @@ @end cartouche Adds the given element if it doesn't already exist. -@c ./../src/action.c 6044 +@c ./../src/action.c 5983 @table @code @@ -956,8 +955,8 @@ ElementSetAttr(refdes,name[,value])@end format @end cartouche -Sets or clears an element-specific attribute -@c ./../src/action.c 6231 +Sets or clears an element-specific attribute. +@c ./../src/action.c 6176 If a value is specified, the named attribute is added (if not already present) or changed (if it is) to the given value. If the value is @@ -994,8 +993,8 @@ ExecCommand(command)@end format @end cartouche -Runs a command -@c ./../src/action.c 6289 +Runs a command. +@c ./../src/action.c 6234 Runs the given command, which is a system executable. @@ -1009,7 +1008,7 @@ @end cartouche Run actions from the given file. -@c ./../src/action.c 5922 +@c ./../src/action.c 5861 Lines starting with @code{#} are ignored. @@ -1023,7 +1022,7 @@ @end cartouche Flip an element to the opposite side of the board. -@c ./../src/action.c 1844 +@c ./../src/action.c 1841 Note that the location of the element will be symmetric about the cursor location; i.e. if the part you are pointing at will still be at @@ -1040,8 +1039,8 @@ FontEdit()@end format @end cartouche -Convert the current font to a PCB for editing -@c ./../src/fontmode.c 72 +Convert the current font to a PCB for editing. +@c ./../src/fontmode.c 73 @node FontSave Action @@ -1052,8 +1051,8 @@ FontSave()@end format @end cartouche -Convert the current PCB back to a font -@c ./../src/fontmode.c 163 +Convert the current PCB back to a font. +@c ./../src/fontmode.c 173 @node FreeRotateBuffer Action @@ -1068,7 +1067,7 @@ angle is given in degrees. If no angle is given, the user is prompted for one. -@c ./../src/buffer.c 1422 +@c ./../src/buffer.c 1370 Rotates the contents of the pastebuffer by an arbitrary angle. If no angle is given, the user is prompted for one. @@ -1083,7 +1082,7 @@ @end cartouche Pull all traces tight. -@c ./../src/puller.c 538 +@c ./../src/puller.c 534 @node h Action @@ -1112,8 +1111,8 @@ @end format @end cartouche -Import schematics -@c ./../src/action.c 6504 +Import schematics. +@c ./../src/action.c 6464 Imports element and netlist data from the schematics (or some other source). The first parameter, which is optional, is the mode. If not @@ -1182,7 +1181,7 @@ which shouldn't be on the board are selected and may be removed once it's determined that the deletion is appropriate. -In @code{Import()} is called with @code{setnewpoint} then the location +If @code{Import()} is called with @code{setnewpoint}, then the location of new components can be specified. This is where parts show up when they're added to the board. The default is the center of the board. @@ -1267,8 +1266,8 @@ LoadFootprint(filename[,refdes,value])@end format @end cartouche -Loads a single footprint by name -@c ./../src/buffer.c 870 +Loads a single footprint by name. +@c ./../src/buffer.c 809 Loads a single footprint by name, rather than by reference or through the library. If a refdes and value are specified, those are inserted @@ -1284,7 +1283,7 @@ @end cartouche Load layout data from a file. -@c ./../src/action.c 5082 +@c ./../src/action.c 5031 This action assumes you know what the filename is. The various GUIs should have a similar @code{Load} action where the filename is @@ -1360,11 +1359,11 @@ @cartouche @format MarkCrosshair() -"``MarkCrosshair(Center)@end format +MarkCrosshair(Center)@end format @end cartouche -Set/Reset the Crosshair mark -@c ./../src/action.c 3537 +Set/Reset the Crosshair mark. +@c ./../src/action.c 3502 The ``mark'' is a small X-shaped target on the display which is treated like a second origin (the normal origin is the upper let @@ -1386,7 +1385,7 @@ @end cartouche Writes a message to the log window. -@c ./../src/action.c 1891 +@c ./../src/action.c 1886 This action displays a message to the log window. This action is primarily provided for use by other programs which may interface with PCB. If @@ -1400,11 +1399,11 @@ @cartouche @format MinClearGap(delta) -"``MinClearGap(Selected, delta)@end format +MinClearGap(Selected, delta)@end format @end cartouche Ensures that polygons are a minimum distance from objects. -@c ./../src/action.c 3866 +@c ./../src/action.c 3827 Checks all specified objects, and increases the polygon clearance if needed to ensure a minimum distance between their edges and the @@ -1417,11 +1416,11 @@ @cartouche @format MinMaskGap(delta) -"``MinMaskGap(Selected, delta)@end format +MinMaskGap(Selected, delta)@end format @end cartouche Ensures the mask is a minimum distance from pins and pads. -@c ./../src/action.c 3790 +@c ./../src/action.c 3752 Checks all specified pins and/or pads, and increases the mask if needed to ensure a minimum distance between the pin or pad edge and @@ -1436,11 +1435,11 @@ Mode(Arc|Arrow|Copy|InsertPoint|Line|Lock|Move|None|PasteBuffer) Mode(Polygon|Rectangle|Remove|Rotate|Text|Thermal|Via) Mode(Notify|Release|Cancel|Stroke) -"``Mode(Save|Restore)@end format +Mode(Save|Restore)@end format @end cartouche Change or use the tool mode. -@c ./../src/action.c 2640 +@c ./../src/action.c 2612 @table @code @@ -1500,7 +1499,7 @@ @end cartouche Converts dead polygon islands into separate polygons. -@c ./../src/action.c 4127 +@c ./../src/action.c 4087 If a polygon is divided into unconnected "islands", you can use this command to convert the otherwise disappeared islands into @@ -1517,8 +1516,8 @@ MoveLayer(old,new)@end format @end cartouche -Moves/Creates/Deletes Layers -@c ./../src/move.c 1062 +Moves/Creates/Deletes Layers. +@c ./../src/move.c 1091 Moves a layer, creates a new layer, or deletes a layer. @@ -1568,7 +1567,7 @@ @end cartouche Moves the object under the crosshair. -@c ./../src/action.c 5623 +@c ./../src/action.c 5567 The @code{X} and @code{Y} are treated like @code{delta} is for many other objects. For each, if it's prefixed by @code{+} or @code{-}, @@ -1586,7 +1585,7 @@ @end cartouche Moves objects to the current layer. -@c ./../src/action.c 5665 +@c ./../src/action.c 5609 Note that moving an element from a component layer to a solder layer, or from solder to component, won't automatically flip it. Use the @@ -1604,7 +1603,7 @@ @end cartouche Perform various actions on netlists. -@c ./../src/netlist.c 291 +@c ./../src/netlist.c 289 Each of these actions apply to a specified set of nets. @var{net} and @var{pin} are patterns which match one or more nets or pins; these @@ -1664,7 +1663,7 @@ @end cartouche Starts a new layout. -@c ./../src/action.c 5145 +@c ./../src/action.c 5093 If a name is not given, one is prompted for. @@ -1678,7 +1677,7 @@ @end cartouche Toggles the optimize-only-autorouted flag. -@c ./../src/djopt.c 127 +@c ./../src/djopt.c 129 The original purpose of the trace optimizer was to clean up the traces created by the various autorouters that have been used with PCB. When @@ -1701,7 +1700,7 @@ @end cartouche Various operations on the paste buffer. -@c ./../src/action.c 5209 +@c ./../src/action.c 5153 There are a number of paste buffers; the actual limit is a compile-time constant @code{MAX_BUFFER} in @file{globalconst.h}. It @@ -1760,7 +1759,7 @@ @end cartouche Some polygon related stuff. -@c ./../src/action.c 5559 +@c ./../src/action.c 5503 Polygons need a special action routine to make life easier. @@ -1786,7 +1785,7 @@ @end cartouche Pull an arc-line junction tight. -@c ./../src/puller.c 418 +@c ./../src/puller.c 411 The @code{Puller()} action is a special-purpose optimization. When invoked while the crosshair is over the junction of an arc and a line, @@ -1844,7 +1843,7 @@ @end cartouche Quits the application after confirming. -@c ./../src/action.c 2123 +@c ./../src/action.c 2071 If you have unsaved changes, you will be prompted to confirm (or save) before quitting. @@ -1859,7 +1858,7 @@ @end cartouche Redo recent``undo''operations. -@c ./../src/action.c 5524 +@c ./../src/action.c 5468 This routine allows you to recover from the last undo command. You might want to do this if you thought that undo was going to revert @@ -1882,7 +1881,7 @@ @end cartouche Removes any selected objects. -@c ./../src/action.c 2860 +@c ./../src/action.c 2832 @node Renumber Action @@ -1891,12 +1890,12 @@ @cartouche @format Renumber() -"``Renumber(filename)@end format +Renumber(filename)@end format @end cartouche Renumber all elements. The changes will be recorded to filename for use in backannotating these changes to the schematic. -@c ./../src/action.c 2878 +@c ./../src/action.c 2848 @node Report Action @@ -1904,11 +1903,11 @@ @c key Report in hid @cartouche @format -Report(Object|DrillReport|FoundPins|NetLength|AllNetLengths)@end format +Report(Object|DrillReport|FoundPins|NetLength|AllNetLengths|[,name])@end format @end cartouche Produce various report. -@c ./../src/report.c 774 +@c ./../src/report.c 942 @table @code @@ -1945,7 +1944,7 @@ @end cartouche Report on the object under the crosshair -@c ./../src/report.c 116 +@c ./../src/report.c 125 This is a shortcut for @code{Report(Object)}. @@ -1959,7 +1958,7 @@ @end cartouche Ripup auto-routed tracks, or convert an element to parts. -@c ./../src/action.c 3230 +@c ./../src/action.c 3199 @table @code @@ -2008,7 +2007,7 @@ @end cartouche Copies the indicated routing style into the current sizes. -@c ./../src/action.c 5591 +@c ./../src/action.c 5535 @node s Action @@ -2036,11 +2035,11 @@ @cartouche @format SaveSettings() -"``SaveSettings(local)@end format +SaveSettings(local)@end format @end cartouche Saves settings. -@c ./../src/action.c 5066 +@c ./../src/action.c 5015 If you pass no arguments, the settings are stored in @code{$HOME/.pcb/settings}. If you pass the word @code{local} they're @@ -2058,7 +2057,7 @@ @end cartouche Saves data to a file. -@c ./../src/action.c 4976 +@c ./../src/action.c 4919 @table @code @@ -2088,17 +2087,17 @@ @c key Select in hid @cartouche @format -Select(ToggleObject) +Select(Object|ToggleObject) Select(All|Block|Connection) Select(ElementByName|ObjectByName|PadByName|PinByName) Select(ElementByName|ObjectByName|PadByName|PinByName, Name) -Select(TextByName|ViaByName) -Select(TextByName|ViaByName, Name) -"``Select(Convert)@end format +Select(TextByName|ViaByName|NetByName) +Select(TextByName|ViaByName|NetByName, Name) +Select(Convert)@end format @end cartouche -Toggles or sets the selection -@c ./../src/action.c 4712 +Toggles or sets the selection. +@c ./../src/action.c 4651 @table @code @@ -2108,6 +2107,7 @@ @item PinByName @item TextByName @item ViaByName +@item NetByName These all rely on having a regular expression parser built into @code{pcb}. If the name is not specified then the user is prompted @@ -2147,7 +2147,7 @@ @end cartouche Sets flags on objects. -@c ./../src/action.c 5774 +@c ./../src/action.c 5716 Turns the given flag on, regardless of its previous setting. See @code{ChangeFlag}. @@ -2166,7 +2166,7 @@ @end cartouche Sets the octagon-flag of objects. -@c ./../src/action.c 4512 +@c ./../src/action.c 4459 @pinshapes @@ -2180,7 +2180,7 @@ @end cartouche Sets current layer and sizes to match indicated item. -@c ./../src/action.c 5706 +@c ./../src/action.c 5648 When invoked over any line, arc, polygon, or via, this changes the current layer to be the layer that item is on, and changes the current @@ -2196,7 +2196,7 @@ @end cartouche sets the square-flag of objects. -@c ./../src/action.c 4348 +@c ./../src/action.c 4301 Note that @code{Pins} means pins and pads. @@ -2218,7 +2218,7 @@ Style = 3 is a solid connection to the plane.Style = 4 has diagonal fingers with rounded edges. Style = 5 has horizontal and vertical fingers with rounded edges. -@c ./../src/action.c 1917 +@c ./../src/action.c 1912 This changes how/whether pins or vias connect to any rectangle or polygon on the current layer. The first argument can specify one object, or all @@ -2244,7 +2244,7 @@ @end cartouche Change various board-wide values and sizes. -@c ./../src/action.c 2036 +@c ./../src/action.c 1996 @table @code @@ -2278,7 +2278,7 @@ @end cartouche Toggles the visibility of element names. -@c ./../src/action.c 4175 +@c ./../src/action.c 4134 If names are hidden you won't see them on the screen and they will not appear on the silk layer when you print the layout. @@ -2312,11 +2312,11 @@ @cartouche @format Undo() -"``Undo(ClearList)@end format +Undo(ClearList)@end format @end cartouche Undo recent changes. -@c ./../src/action.c 5360 +@c ./../src/action.c 5304 The unlimited undo feature of @code{Pcb} allows you to recover from most operations that materially affect you work. Calling @@ -2355,12 +2355,12 @@ Unselect(ElementByName|ObjectByName|PadByName|PinByName) Unselect(ElementByName|ObjectByName|PadByName|PinByName, Name) Unselect(TextByName|ViaByName) -"``Unselect(TextByName|ViaByName, Name) +Unselect(TextByName|ViaByName, Name) @end format @end cartouche -unselects the object at the pointer location or the specified objects -@c ./../src/action.c 4862 +Unselects the object at the pointer location or the specified objects. +@c ./../src/action.c 4803 @table @code @@ -2415,7 +2415,7 @@ @end cartouche Saves the layout data and quits. -@c ./../src/command.c 281 +@c ./../src/command.c 291 This command has been added for the convenience of @code{vi} users and has the same functionality as @code{s} combined with @code{q}. @@ -2425,7 +2425,7 @@ @node common actions @section common actions -@c ./../src/hid/common/actions.c 424 +@c ./../src/hid/common/actions.c 425 @macro hidaction @@ -2441,7 +2441,7 @@ * LayersChanged Action:: Tells the GUI that the layers have changed. * LibraryChanged Action:: Tells the GUI that the libraries have changed. * NetlistChanged Action:: Tells the GUI that the netlist has changed. -* PCBChanged Action:: Tells the GUI that the whole PCB has changed. +* PCBChanged Action:: Tells the GUI that the whole PCB has changed. The optional``revert"parameter can be used as a hint to the GUI that the same design is beingreloaded, and that it might keep some viewport settings * RouteStylesChanged Action:: Tells the GUI that the routing styles have changed. @end menu @node LayersChanged Action @@ -2453,7 +2453,7 @@ @end cartouche Tells the GUI that the layers have changed. -@c ./../src/hid/common/actions.c 445 +@c ./../src/hid/common/actions.c 446 This includes layer names, colors, stacking order, visibility, etc. @@ -2469,7 +2469,7 @@ @end cartouche Tells the GUI that the libraries have changed. -@c ./../src/hid/common/actions.c 450 +@c ./../src/hid/common/actions.c 451 @hidaction @@ -2483,7 +2483,7 @@ @end cartouche Tells the GUI that the netlist has changed. -@c ./../src/hid/common/actions.c 440 +@c ./../src/hid/common/actions.c 441 @hidaction @@ -2493,11 +2493,11 @@ @c key PCBChanged in hid common @cartouche @format -PCBChanged()@end format +PCBChanged([revert])@end format @end cartouche -Tells the GUI that the whole PCB has changed. -@c ./../src/hid/common/actions.c 430 +Tells the GUI that the whole PCB has changed. The optional``revert"parameter can be used as a hint to the GUI that the same design is beingreloaded, and that it might keep some viewport settings +@c ./../src/hid/common/actions.c 431 @hidaction @@ -2511,7 +2511,7 @@ @end cartouche Tells the GUI that the routing styles have changed. -@c ./../src/hid/common/actions.c 435 +@c ./../src/hid/common/actions.c 436 @hidaction @@ -2520,11 +2520,11 @@ @section gtk actions @menu * gtk About Action:: N_("Tell the user about this version of PCB."); -* gtk AdjustStyle Action:: Open the window which allows editing of the route styles +* gtk AdjustStyle Action:: Open the window which allows editing of the route styles. * gtk Center Action:: N_("Moves the pointer to the center of the window."); * gtk Cursor Action:: N_("Move the cursor."); * gtk DoWindows Action:: N_("Open various GUI windows."); -* gtk EditLayerGroups Action:: Open the preferences window which allows editing of the layer groups +* gtk EditLayerGroups Action:: Open the preferences window which allows editing of the layer groups. * gtk GetXY Action:: N_("Get a coordinate."); * gtk ImportGUI Action:: N_("Asks user which schematics to import into PCB. "); @@ -2552,7 +2552,7 @@ @end cartouche N_("Tell the user about this version of PCB."); -@c ./../src/hid/gtk/gtkhid-main.c 1173 +@c ./../src/hid/gtk/gtkhid-main.c 1059 This just pops up a dialog telling the user which version of @code{pcb} they're running. @@ -2567,8 +2567,8 @@ @end format @end cartouche -Open the window which allows editing of the route styles -@c ./../src/hid/gtk/gui-top-window.c 3816 +Open the window which allows editing of the route styles. +@c ./../src/hid/gtk/gui-top-window.c 2081 Opens the window which allows editing of the route styles. @@ -2583,7 +2583,7 @@ @end cartouche N_("Moves the pointer to the center of the window."); -@c ./../src/hid/gtk/gtkhid-main.c 1633 +@c ./../src/hid/gtk/gtkhid-main.c 1470 Move the pointer to the center of the window, but only if it's currently within the window already. @@ -2598,7 +2598,7 @@ @end cartouche N_("Move the cursor."); -@c ./../src/hid/gtk/gtkhid-main.c 1732 +@c ./../src/hid/gtk/gtkhid-main.c 1515 This action moves the mouse cursor. Unlike other actions which take coordinates, this action's coordinates are always relative to the @@ -2642,7 +2642,7 @@ @end cartouche N_("Open various GUI windows."); -@c ./../src/hid/gtk/gtkhid-main.c 1790 +@c ./../src/hid/gtk/gtkhid-main.c 1563 @table @code @@ -2683,8 +2683,8 @@ @end format @end cartouche -Open the preferences window which allows editing of the layer groups -@c ./../src/hid/gtk/gui-top-window.c 3839 +Open the preferences window which allows editing of the layer groups. +@c ./../src/hid/gtk/gui-top-window.c 2100 Opens the preferences window which is where the layer groups are edited. This action is primarily provides to provide menu @@ -2700,7 +2700,7 @@ @end cartouche N_("Get a coordinate."); -@c ./../src/hid/gtk/gtkhid-main.c 1188 +@c ./../src/hid/gtk/gtkhid-main.c 1074 Prompts the user for a coordinate, if one is not already selected. @@ -2710,12 +2710,12 @@ @c key gtk ImportGUI in hid gtk @cartouche @format -Popup(MenuName, [Button])@end format +ImportGUI()@end format @end cartouche N_("Asks user which schematics to import into PCB. "); -@c ./../src/hid/gtk/gtkhid-main.c 2007 +@c ./../src/hid/gtk/gtkhid-main.c 1750 Asks user which schematics to import into PCB. @@ -2731,11 +2731,10 @@ N_("Start or stop panning (Mode = 1 to start, 0 to stop) Optional thumb argument is ignored for now in gtk hid. "); -@c ./../src/hid/gtk/gtkhid-main.c 1913 +@c ./../src/hid/gtk/gtkhid-main.c 1687 Start or stop panning. To start call with Mode = 1, to stop call with -Mode = 0. If the Mode is turned on and off with the cross hairs at -the same coordinates, the auto pan mode is toggled. +Mode = 0. @node gtk Popup Action @@ -2749,12 +2748,11 @@ N_("Bring up the popup menu specified by @code{MenuName}. If called by a mouse event then the mouse button number must be specified as the optional second argument."); -@c ./../src/hid/gtk/gtkhid-main.c 1958 +@c ./../src/hid/gtk/gtkhid-main.c 1719 This just pops up the specified menu. The menu must have been defined as a named subresource of the Popups resource in the menu resource -file. If called as a response to a mouse button click, the mouse -button number must be specified as the second argument. +file. @node gtk Print Action @@ -2766,7 +2764,7 @@ @end cartouche N_("Print the layout."); -@c ./../src/hid/gtk/gtkhid-main.c 1508 +@c ./../src/hid/gtk/gtkhid-main.c 1350 This will find the default printing HID, prompt the user for its options, and print the layout. @@ -2781,7 +2779,7 @@ @end cartouche N_("Calibrate the printer."); -@c ./../src/hid/gtk/gtkhid-main.c 1559 +@c ./../src/hid/gtk/gtkhid-main.c 1401 This will print a calibration page, which you would measure and type the measurements in, so that future printouts will be more precise. @@ -2799,7 +2797,7 @@ @end cartouche N_("Save layout and/or element data to a user-selected file."); -@c ./../src/hid/gtk/gtkhid-main.c 1334 +@c ./../src/hid/gtk/gtkhid-main.c 1230 This action is a GUI front-end to the core's @code{SaveTo} action (@pxref{SaveTo Action}). If you happen to pass a filename, like @@ -2817,7 +2815,7 @@ @end cartouche Select which layer is the current layer. -@c ./../src/hid/gtk/gui-top-window.c 2830 +@c ./../src/hid/gtk/gui-top-window.c 1851 The specified layer becomes the currently active layer. It is made visible if it is not already visible @@ -2832,7 +2830,7 @@ @end cartouche N_("Set the default measurement units."); -@c ./../src/hid/gtk/gtkhid-main.c 1833 +@c ./../src/hid/gtk/gtkhid-main.c 1606 @table @code @@ -2854,7 +2852,7 @@ @end cartouche N_("Swaps the side of the board you're looking at."); -@c ./../src/hid/gtk/gtkhid-main.c 1416 +@c ./../src/hid/gtk/gtkhid-main.c 1295 This action changes the way you view the board. @@ -2897,7 +2895,7 @@ @end cartouche Toggle the visibility of the specified layer or layer group. -@c ./../src/hid/gtk/gui-top-window.c 2754 +@c ./../src/hid/gtk/gui-top-window.c 1792 If you pass an integer, that layer is specified by index (the first layer is @code{1}, etc). If you pass a layer name, that layer is @@ -2919,7 +2917,7 @@ @end cartouche N_("Various zoom factor changes."); -@c ./../src/hid/gtk/gtkhid-main.c 108 +@c ./../src/hid/gtk/gtkhid-main.c 161 Changes the zoom (magnification) of the view of the board. If no arguments are passed, the view is scaled such that the board just fits inside the visible window (i.e. ``view all''). Otherwise, @@ -2997,7 +2995,7 @@ @end cartouche Tell the user about this version of PCB. -@c ./../src/hid/lesstif/dialogs.c 870 +@c ./../src/hid/lesstif/dialogs.c 867 This just pops up a dialog telling the user which version of @code{pcb} they're running. @@ -3012,7 +3010,7 @@ @end cartouche Let the user change the board size, DRC parameters, etc -@c ./../src/hid/lesstif/dialogs.c 1154 +@c ./../src/hid/lesstif/dialogs.c 1136 Displays a dialog box that lets the user change the board size, DRC parameters, and text scale. @@ -3029,7 +3027,7 @@ @end cartouche Displays the route style adjustment window. -@c ./../src/hid/lesstif/styles.c 348 +@c ./../src/hid/lesstif/styles.c 344 @node lesstif Benchmark Action @@ -3041,7 +3039,7 @@ @end cartouche Benchmark the GUI speed. -@c ./../src/hid/lesstif/main.c 624 +@c ./../src/hid/lesstif/main.c 659 This action is used to speed-test the Lesstif graphics subsystem. It redraws the current screen as many times as possible in ten seconds. @@ -3057,7 +3055,7 @@ @end cartouche Displays the command line input window. -@c ./../src/hid/lesstif/main.c 609 +@c ./../src/hid/lesstif/main.c 644 The command window allows the user to manually enter actions to be executed. Action syntax can be done one of two ways: @@ -3101,7 +3099,7 @@ @end cartouche Move the cursor. -@c ./../src/hid/lesstif/main.c 681 +@c ./../src/hid/lesstif/main.c 716 This action moves the mouse cursor. Unlike other actions which take coordinates, this action's coordinates are always relative to the @@ -3176,7 +3174,7 @@ @end cartouche Open various GUI windows. -@c ./../src/hid/lesstif/dialogs.c 834 +@c ./../src/hid/lesstif/dialogs.c 831 @table @code @@ -3229,7 +3227,7 @@ @end cartouche Let the user change the layer groupings -@c ./../src/hid/lesstif/dialogs.c 1466 +@c ./../src/hid/lesstif/dialogs.c 1448 Displays a dialog that lets the user view and change the layer groupings. Each layer (row) can be a member of any one layer group @@ -3249,7 +3247,7 @@ @end cartouche Export the layout. -@c ./../src/hid/lesstif/dialogs.c 960 +@c ./../src/hid/lesstif/dialogs.c 957 Prompts the user for an exporter to use. Then, prompts the user for that exporter's options, and exports the layout. @@ -3278,7 +3276,7 @@ @end cartouche Lets the user choose the schematics to import from -@c ./../src/hid/lesstif/dialogs.c 1900 +@c ./../src/hid/lesstif/dialogs.c 1882 Displays a dialog that lets the user select the schematic(s) to import from, then saves that information in the layout's attributes for @@ -3307,7 +3305,7 @@ @end cartouche Load layout data from a user-selected file. -@c ./../src/hid/lesstif/dialogs.c 98 +@c ./../src/hid/lesstif/dialogs.c 99 This action is a GUI front-end to the core's @code{LoadFrom} action (@pxref{LoadFrom Action}). If you happen to pass a filename, like @@ -3325,7 +3323,7 @@ @end cartouche Loads a user-selected vendor resource file. -@c ./../src/hid/lesstif/dialogs.c 151 +@c ./../src/hid/lesstif/dialogs.c 152 The user is prompted for a file to load, and then @code{LoadVendorFrom} is called (@pxref{LoadVendorFrom Action}) to @@ -3341,7 +3339,7 @@ @end cartouche Selects the given pinname or netname in the netlist window. -@c ./../src/hid/lesstif/netlist.c 416 +@c ./../src/hid/lesstif/netlist.c 415 @node lesstif Print Action @@ -3353,7 +3351,7 @@ @end cartouche Print the layout. -@c ./../src/hid/lesstif/dialogs.c 897 +@c ./../src/hid/lesstif/dialogs.c 894 This will find the default printing HID, prompt the user for its options, and print the layout. @@ -3368,7 +3366,7 @@ @end cartouche Calibrate the printer. -@c ./../src/hid/lesstif/dialogs.c 940 +@c ./../src/hid/lesstif/dialogs.c 937 This will print a calibration page, which you would measure and type the measurements in, so that future printouts will be more precise. @@ -3383,7 +3381,7 @@ @end cartouche Prompt for a response. -@c ./../src/hid/lesstif/dialogs.c 574 +@c ./../src/hid/lesstif/dialogs.c 560 This is mostly for testing the lesstif HID interface. The parameters are passed to the @code{prompt_for()} HID function, causing the user @@ -3418,7 +3416,7 @@ @end cartouche Save layout data to a user-selected file. -@c ./../src/hid/lesstif/dialogs.c 196 +@c ./../src/hid/lesstif/dialogs.c 197 This action is a GUI front-end to the core's @code{SaveTo} action (@pxref{SaveTo Action}). If you happen to pass a filename, like @@ -3451,7 +3449,7 @@ @end cartouche Set the default measurement units. -@c ./../src/hid/lesstif/main.c 364 +@c ./../src/hid/lesstif/main.c 395 @table @code @@ -3473,7 +3471,7 @@ @end cartouche Swaps the side of the board you're looking at. -@c ./../src/hid/lesstif/main.c 459 +@c ./../src/hid/lesstif/main.c 494 This action changes the way you view the board. @@ -3538,7 +3536,7 @@ @end cartouche Various zoom factor changes. -@c ./../src/hid/lesstif/main.c 384 +@c ./../src/hid/lesstif/main.c 419 Changes the zoom (magnification) of the view of the board. If no arguments are passed, the view is scaled such that the board just fits diff -Nru pcb-20100929/doc/gcode_control_img.eps pcb-20110918/doc/gcode_control_img.eps --- pcb-20100929/doc/gcode_control_img.eps 1970-01-01 00:00:00.000000000 +0000 +++ pcb-20110918/doc/gcode_control_img.eps 2011-06-05 21:25:44.000000000 +0000 @@ -0,0 +1,711 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: GIMP PostScript file plugin V 1,17 by Peter Kirchgessner +%%Title: gcode_control_img.eps +%%CreationDate: Mon May 30 02:37:26 2011 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%Pages: 1 +%%BoundingBox: 0 0 404 231 +%%EndComments +%%BeginProlog +% Use own dictionary to avoid conflicts +10 dict begin +%%EndProlog +%%Page: 1 1 +% Translate for offset +0 0 translate +% Translate to begin of first scanline +0 230.40000000000001 translate +403.20000000000005 -230.40000000000001 scale +% Image geometry +1680 960 1 +% Transformation matrix +[ 1680 0 0 960 0 0 ] +currentfile /ASCII85Decode filter /RunLengthDecode filter +%%BeginData: 51668 ASCII Bytes +image +JcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqR +JcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqR +JcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqR +JcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqRJcDqR +nG`K=^]4@!KE(H@!._ib!'c,9nG`K=^]4@!KE(H@!._ib!'c,9nG`K=^]4@!KE(H@!._ib!'c,9 +nG`K=^]4@!KE(H@!._ib!'c,9nG`K=^]4@!KE(H@!._ib!'c,9nG`K=^]4@!jSo5LklA9onG`K= +^]4@!jSo4qkl:]J])V:"!._ib!'fQEkPtSn])V:"!._ib!'fTF!<20^!!g+8nG`K=^]4@!jo5>Y +kPtSb])V:"!._ib!'fTF!;PaX!!0\2nG`K=^]4@!jo5>Mk5`*nnG`K=^]4@!jo5>=k5YL3]DqC# +!._ib!'fTF!5Rat!'e*qnG`K=^]4@!jo5=2k5YK(]DqC#!._ib!'fTFjo>Al]DqC#!._ib!'fWG +!<2*\!!g.9nG`K=^]4@!k5PGZjo>A`]DqC#!._ib!'fWG!;P[V!!0_3nG`K=^]4@!k5PGNjT)pm +nG`K=^]4@!k5PG>jT#:1]`7L$!._ib!'fWG!5R[r!'e-rnG`K=^]4@!k5PF3jT#9&]`7L$!._ib +!'fWGj8]/j]`7L$!._ib!'fZH!<2$Z!!g1:nG`K=^]4@!kPkP[j8]/^]`7L$!._ib!'fZH!;PUT +!!0b4nG`K=^]4@!kPkPOirHalnG`K=^]4@!kPkP?irB(/^&RU%!._ib!'fZH!5RUp!'e0snG`K= +^]4@!kPkO4irB'$^&RU%!._ib!'fZHiW&rh^&RU%!._ib!'f]I!<1sX!!g4;nG`K=^]4@!kl1Y\ +iW&r\^&RU%!._ib!'f]I!;QKm!"\Dqr;Zfu^&RU%!._ib!'f]I!:]pe!$CP,!.b"J^&RU%!._ib +!'f]I!9!eU!'ffL!5SO5!.V`_nG`K=^]4@!kl1Xur;ZhIli-tCr;Zg^^Am^&!._ib!'f]I!.b"J +lMgkRr;Zg>^Am^&!._ib!'f]Ir;ZfulMgkZr;Zg.^Am^&!._ib!'f`J!<2os!!DNd!;ucq!!g7< +nG`K=^]4@!l2Lb]r;Zg&lMgk`r;Zg"^Am^&!._ib!'f`J!;QKm!"\>or;Zfu^Am^&!._ib!'f`J +!;QKm!$CJ*!.b"J^Am^&!._ib!'f`J!:]pe!'f`J!5SO5!.Vc`nG`K=^]4@!l2LbQr;ZhIl2LbA +r;Zg^^]3g'!._ib!'f`J!9!eUkl1YPr;Zg>^]3g'!._ib!'f`J!9!hV!!2<`!;QKm!"ZjEnG`K= +^]4@!l2LbArVup#kl1Y\r;Zg&^]3g'!._ib!'f`J!9!hV!!h`f!<2os!!C"9nG`K=^]4@!l2LbA +rVup/kPtJ\!!0k7nG`K=^]4@!l2LbArVup?kPkO4r;aV4nG`K=^]4@!l2LbArVup_kPkOtr;ZhI +_#Np(!._ib!'f`J!9!hV!.X23!9!eU!'e:!nG`K=^]4@!l2LbArW)*\!:]pe!$B#VnG`K=^]4@! +l2LbArW)*\!;QKm!"ZmFnG`K=^]4@!l2LbArW)*\!;ucq!!g=>nG`K=^]4@!l2LbArW)*\!<2os +!!C%:nG`K=^]4@!l2LbArW)'[r;Zfu_#Np(!._ib!'f`J!9!hVjo5=2r;aY5nG`K=^]4@!l2LbA +rW)'[!5SO5!.VibnG`K=^]4@!l2LbArW)'[!9!eU!'e="nG`K=^]4@!l2LbArW)'[!:]pe!$B&W +nG`K=^]4@!l2LbArW)'[!;QKm!"ZpGnG`K=^]4@!l2LbArW)'[!;ucq!!g@?nG`K=^]4@!l2LbA +rW)'[!<2os!!C(;nG`K=^]4@!l2LbArW)$Zr;Zfu_>j$)!._ib!'f`J!9!hVjSo41r;a\6nG`K= +^]4@!l2LbArW)$Z!5SO5!.VlcnG`K=^]4@!l2LbArW)$Z!9!eU!'e@#nG`K=^]4@!l2LbArW)$Z +!:]pe!$B)XnG`K=^]4@!l2LbArW)$Z!;QKm!"ZsHnG`K=^]4@!l2LbArW)$Z!;ucq!!gC@nG`K= +^]4@!l2LbArW)$Z!<2os!!C+^L+ +mf*9;r;Zg"i;`i!!!9%rrD!V!;c]q_#"-#s7u]q&+9GtJGfHJ"5s4Krr@Sc!!*?( +mf3=ir;QcTrW)fp!5SI3n,EBPmr;QcTrW)fp!5SI3n,EC_ +qZ$U,n,ECcqZ$VGiW&EI!._lc!>"tn!!%NIrrD!V!;c]q_#"-#rrDuo!!!PurrDuo!!%N-s7$$g +JAD3d&,>Pm!.XtI!9!hVqYpQ2qZ-*b!;u]o!"\Pu!;u]o!.Wu-nG`K=_#OKHq!J+^5Q1T^i;N`Q +rrBk3!:Tpfr;-Ho&+BMur;-HoJ)UFsrr@Sc!!*W*mJm5OrVllUrW)fp!5SI3n,ECcqZ$U,n,EC_ +qZ$U\iW&EI!._lc!>"tn!!#7^rrD!V!;c]q_#"-#rrDuo!!!PurrDik!!#7Bs7$$gJAD3d&,>Pm +!'gG^!9!hVqYpQ2qZ-*b!;u]o!"\Pu!;QEk!'fHBnG`K=_#OKHq!J+^+8u3>i;N`QrrBk3!:Tpf +r;-Ho&+BMuq"k$k5N2Y3rr@Sc!!*W*mJm5/rVllUrW)fp!5SI3n,ECcqZ$U,n,EC_qZ$U\iW&EI +!._lc!>"tn!!",>rrD!V!;c]q_#"-#rrDuo!!!PurrDik!!#7Bs7$$gJAD3d&,>Pm!$D1>!9!hV +qYpQ2qZ-*b!;u]o!"\Pu!;QEk!'fHBnG`K=_#OKHq!J+^+8u3>i;N`QrrBk3!:Tpfr;-Ho&+BMu +q"k$k5N2Y3rr@Sc!!*W*mJm5/rVllUrW)fp!5SI3n,ECcqZ$U,n,EC_qZ$U\iW&EI!._lc!>"tn +!!",>rrD!V!;c]q_#"-#rrDuo!!!PurrDuo!!%N-s7$$gJAD3d&,>Pm!$D1>!9!hVqYpQ2qZ-*b +!;u]o!"\Pu!;u]o!.Wu-nG`K=_#OKHq!J+^+8u3>i;N`QrrBk3!:Tpfr;-Ho&+BMur;-HoJ)UFs +rr@Sc!!*W*mJm5OrVllUrW)fp!5SI3n,ECcqZ$U,n,ECcqZ$VGiW&EI!.`8n!!2us!<2rt!>"u) +!!#7ZrrE&q!!#7^rrD!V!;c]q_#"-#rrDuo!!!PurrE&q!9!nHrr@Sn!!!,ts8E!!&,?,(!'g;Z +!<2iq!'gG^!9!hVqYpQ2qZ-*b!;u]o!"\Pu!<2iqi;`EquHZp!9!hVqYpQ2qZ-*b +!;u]o!"\Mt!.b"J!!D0ZnG`K=bQ%VbqZ$d%huE`fq#16n5PY6YJG]EFrrD!V!;c]q_#"-#rrDuo +!!!Ptrr@TJ!!!8^s7$$gJBRun+8Z$A"5j.Z&,?,(!'g8Y!5SO5!!3#t!9!hVqYpQ2qZ-*b!;u]o +!"\Mtqu?^-i;`!!NJ_!!!Q)rVup_mJd1ErW(%>!5SO5 +!.Wl*nG`K=f)Pf#pAb!i"U!Z_!"\l(!!#7NrrD!V!6G0?JGfK(s7$$gJCaeos8)d""5j.Z&,?,( +!'flN!9!hVaT)2=!!1pUnG`K=fDkmPp&Fmh"U!Z_!"\l(!!#7NrrD!V!6P6@rqufs"5X"Hrr@T% +!!39&r:'aj"5j.Z&,?,(!'flN!9!hVao;A=r;Zg&h>d!E!.`]%!XJbpnGi^phuE`fq#16n5OJIN +i;N_urrDim!!!Pcs7$$gJCji'&-'H8!!NJ_!!!Q)rVup_mJd1ErW((?!:]pe!$C%snG`K=fDksp +s+'V>"U!Z_!"\l(!!#7WrrMToqYpQRrW)]m!<@W"rrD!U!!#7>s7$$gJCji&5QC3Q"U!Z_!"\l( +!!#7Ws8N'!J,B6G_#=?/rrVZi#M&hS_#465J)1.orr@T%!!.TKn,NUohuE`fq#16n5PP0[qu?^= +qu6YHrW)`n!l+d:ec,W"r;bXQnG`K=fDksPr9s[i"5j.Z&,?,(!'g5X"7Q9j#Q+Q"!;QTn!!%N" +s8;ot!Sm_Err@TH!<<'!^u>=q!WVra!!NJ_!!!Q)rVup_p\t?2!!!&trrE&s!;ZWpr;HZr+4pMm +rqufs"5NqGrr@TI!!=>Cs8M!X!X&Jln,NUohuE`fq#16n5PP0XJGoQHrrDuq!;ZWpq#16n&(gg] +r;?Tq#Mf@Krr@TJ!!!-"rrDQK!!3E*i:$^M"5j.Z&,?,(!'g5Xr;ZhIrVllmr;cZn!:]sf!!h-U +!;QKm!"[lbnG`K=r;Zg.rVllqirB,ks1n+("U!Z_!"\l(!!#7YrrE&s!!#7^rrDQe!;ZWpi;N]V +"5!PQnGN=e+5Hncrr@TJ!!%NHs5O(\+9-l\!!NJ_!!!Q)rVup_q#:?lr;Zg>rVllUr;cZn!5SR6 +!!1^O!9!eU!'f9=nG`K=rVup!qu6ZSj8]3Fs6fpk"5j.Z&,?,(!'g8Y!;QKm!"]&.!5SR6!!2oq +!.b"JfDbidr;ZhIh#HmD!.b%K!!iE$!;PUT!It+;!!NJ_!!!Q)rVup_q#:?`r;Zg&rVlkJrVup! +q>^?m!.WZ$!.b"Jg]-dC!.b%K#9X!G^]FK8ro=%[s8;_s7l$_"U!Z_!"\l(!!#7YrrBk,!!!,t +rrDup!!"+orrE&s!!!,Us7$$gJGoQKrr@TK!<<'!^ubUu"97lZ!!NJ_!!!Q)rVup_q#:?0oDejr +qYpQnqu?^=g&D'Mr;Zg&g]-dC"b6RQ!WW)r!!48Bi8t"@#QN`N!!NJ_!!!Q)rVup_q#:>EoDek% +qYpQjqu?^-g&D'Ir;Zg.g]-dC"b6RQ#QN`\!!39&puVPX&-'H6!!NJ_!!!Q)rVup_q#:>EoDek5 +qYpQjqu?^-g&D'Ar;Zg>g]-dC"b6RQ&-%1X!!3,tjo>H)s+'P<"U!Z_!"\l(!!#7Ys763j5PkB[ +nGE7d#MK+Wi;EWU5MQ5-rrdiP!$D4;!!,=`jo>EHs6]jj"5j.Z&,?,(!'g8Yo)Jc?qYpQbqu?^% +g&D&fr;ZhIg]-dC"FpIPJ,K0D!?_@(!!.TKmJmCmhuE`fq#16n5PbUHooDejnq>UHQqu?^!gA_0Pr;Zg"gAg[B +"FpISs+'qG!WVZQ!!39&nEp8["5j.Z&,?,(!'g;Z!<2Tj!!i?"!9!bT!!CsT!;ucq!!h6XnG`T@ +!!iQ"!!.TEkPtYhs5<;F"U!Z_!"\l(!!#7ZrrDuh!!!Q*rrBk4!!!&RrrDim!!!P`s7$$jJ,g,X +q#CF;r9++^&-'H5!!NJ_!!!Q)rVup_q>UHmoDek5q>UH1qu?]tgA_0Br;Zg>gAg[B"+U@nq"Xmj +&,tbm![%GmmJmCmhuE`fq#16n5Pb;!<`Ac!!.TK +r;Zg"q#C3k"U!Z_!"\l(!!#7ZrrDuh!;QQo_#+04!S[PRJGfK$s7$$jJ,k)7q#CHss+'>6!WW)r +!!!9!s8)d""5j.Z&,?,(!'g;Z!;uKi!!2lp!5SL4!!1gRr;Zfug&LRA"+UCOJG9*Fs1mn"!Wi>r +r;Zg.q#C3k"U!Z_!"\l(!!#7ZrrDui!!!,rrrBk4!!!&SrrE&s!!!,Ss7$$iJ-#]E!!.T-l2Ukf +s7#se!$D"9qZ$d%huE`fq#16n5Pb"tj +!!,=ar;ZfunG`XL!!!Q)rVup_q>UHoo`+uAq#:?Pqu?^!g]%8hr;ZhIg&LRA!e:gNpAb4!r9=7_ +J,]BH!!D`j"Mb!;&,?,(!'g;Z!<2Wkp\t6Oqu?^!g]%8(r;bLMnG`Q?&)d0^!<`8b!!3,tr;Zm( +s5<_R!!iB#"FpIP&,?,(!'g8Yp&G'np\t6_qu?^%g].3P!!1aPnG`Q?+5lkn!<`>e!!33$q#(0o +&-'HA!!!,ts8E!!&,?,(!'g8Yp&G'pp\t6_qu?^%h#@BRr;Zg"f`1I@!e;B.pAb3prp'Oc"97lh +!!48BJG9*EJ,]HKrUBdd!>"u)!!#7Yrr@TD!!!8urrDil!!!PbrrDuq!!!8Vs7$$iJ3UjD!!*-# +lMptks5=Hr;ZkJrqHHs!WW&us8Mrs!C-AY!!#7YrrBk/!!#7XrrDup!!"+rrrDQe!!"+ns7$$h +J:I4l!IoXd!!48BJGfHKs8;Wl"UG(C!$D7>!!,=ZrVup_q#:?0pAjpe!;u`p!$C"r!9!eU!'f-9 +nG`N>J+WdBIt6kc!C-V_!!33$q"Ogl&,uV0#Q+N$q#16n5PY6Yi;EWU"7cBkrql`r5MZ8=_#465 +J(XejrrIZLo`,"W_!D%%J,]BH!X&Jlp](F=qu?]tqu6ZkrVup_q#:?`r;Zg&nGiCd!.Wf(!.b"J +fDk@?!J(1B!!,="li7(dr;?Ts#QN`W!!,=RrVuqJr;QcdrVup_q#:?hr;Zg.nG`K=r;bUPr;Zfu +fDk@?!J11A!!+2"m/R1is7lNm!Y>=Hp](=Zi;N]V5Q(N]i;N]V5PY6Yr;?Tq+7T:1_#=<6!Sm\T +rqufs"5!SBrrI]Ko`,"7i9^LG#QO;l!!48BJG9*FJ&)$`!$D.=!5SR6!'g8Y!<2os!'fuQ!9!hV +!!D$V!;ucq!!h-UnG`N?r:L$j+5lMd!XJb`r;Zj_s7ZKos+((K!"]#-!.b%K!'g5Xr;ZhInG`LX +rVup'h#@BLr;Zg.fDk@?!J1%=!!*Vgm/R1us1nR5!It+D!!*-#r;Zg&r;Z]q!'g5X!.b%Kn,EC_ +rVup/h#@BDr;Zg>fDk@?!JC1?!!*W"m/R20s+(%J!WW)m!!*-"r;Zg"rVllsr;Zg^p\t?2!!!&g +rrDur!!"+rrrD!U!!#78s7$$hKD>*>!>"\e!!+2Ar;Zm"s7l?h!<`8u!!!&urrDuq!!#7Xrr_`j +!!hrlrVuqJh#@Air;ZhIfDk@?!JBn7!!*>om/R/Orqufu"97lc!!*2squH]q!;QKm!'g5X"8i-! ++7B.1^]4Dirr@TJ!7q2>rrIcAo`,!tnEg2V5Q(H[!XJb`p](="nFHV[J+ipB!!%N:rrVZi#M]:W +!!!&Ns7$$hKCJO6!=/,]!!,=Zr;Zm0s1nC0!=/,c!!%NBrrMTom/I(dJ)(&(rqufs"4mMArrIo5 +o`,!pq!A%^J+3C:!?_@9!!*Vgo)Q9"!;ucq!!h*TnG`NEi:R'N"8M6`!Is&+!!,=`pAb4)i:?rX +rrDim!!!P\s7$$hLZ%h*!<`,a!!.Sbr;ZkJr:^0l&&@f;!!0S/!:]pe!$BelnG`NEi:R'N"8M6` +!WTt6!!3,ppAb4)_"7U,"1S:1i;EWU5M#l(rrIo5o`,!pq!A%^s+((K!Wi>jpAb49JFigA#Ij^5 +_#465J(FYhrrIo5o`,!pq!A%^s+((K!X&J\pAb49JFigA&%DQ=JGfJus7$$hLVWQ_!'^#OMHk +!.Wi)!<2os!!CdOnG`NM_"@[.!W;?c![KQr;Zg& +ec5.=!KY%h!!*,umJm7gs8;ou5Q:?V!'g&Tp&>-l!!",/rrTt9!T!bUq#(0m&(U^LrrJ1ro`,!n +r9aOc!WW)u!It%@!!#7U!!!&mrr_`j!!hrlrVuqJhZ!TFr;Zg>ec5.=!KY%h!!*,umJm7gs8;ou +s7l9f!'g)U!!Doo"2Fm:!Up$gr;HZr+5["ti;EWU5Lof'rrJ1ro`,!nr9aOc!WW-!!Wi>jp&G(W +oDejrp&>#BrW)Ee!;QNn!"[rd!5SO5!.WQ!nG`NM_"@[.!W;?c!#BquHQm!<2Tj!"\#f!.b"Je,Sq;!JfV+!!*2smJm7gs8E!!#Q45p!>!!>!!",6rr@TI +!;ZWpr:Bsh&)dKd!!!&Ks7$$hLZ%h*!<`,b!!*-#rVus(r:L$j&)d-]!'g/VqZ$VGqYpQjoDejr +iVroWr;Zg"e,Sq;!JB>'!!*2kmJm7gs8E!!#Q45p!=.QV!!%NAs8)crJ,90FnFQ\\#N>[_r;?Tq +#Li_BrrIcAo`,!tnEp8W!WW-!!=/Pq!!*>opAb0op&>$kqZ$U\qYpQRoDejniVroQr;Zg.e,Sq; +!JBn7!!*>omJm7gs8E!!#Q45p!<_ic!!!8srrE&q!!#7[rrBk,!!!,[rrDQe!!"+is7$$hKCJO6 +!=/,^!!*-#rVus(r:L$j"8Mcon,ECeqZ$U\qYpPGoDejniVro9r;Zg^e,Sq;!JC1?!!*W"mJm7g +s8E!!#Q45p!Ie<[A5Ci/%!$iqZ$U$VrqcZq5Q(N]q!nCb"8DfqpuqbY"4@/$kqZ$U\r;Qcdnc/Xlp\t6_kl:\gdJr_9!e:g>pAb3rr9XIb +!WW-!!=/Po!!!Q/rrBk4!!#7VrrE&q!!#7]rrD!J!!!,qrrD!A!!!PWs7$$iJ.LT4!!*3"m/R.f +s8E!!#Q4/n!"])/!5SL4!'g,UqZ$VGr;Qc4nc/Xpp\t6/kl:]*dJr_9!e:OFpAb4!q!A%^!WW-! +!=/Po!!",?rrD!T!!#7Us8)crJ,Kf!!*-#rVus(r:Bsi5N)M@!C-)P!!#7UrrDuq!!",=rrD!U!;c]q_#=<6!VcToJE[%65LBH" +rr[cO+7T(+!=/Vj!!*-#rVus(r:BsiJ&)$`!?_+8!!#7UrrE&s!!#7]rrD!V!!!&rrrD!V!!!,q +s6'F_J'e5brr[cO&,>r#!>#+p!!*-#rVus(r:Bsis+((K!>#,,!!#7Ts8;otJ,K:li7%es8E!! +#Q45p!<`,p!!*&t!!#7Trr`0!!$D+_#=<65O&1Ji;N`BrrDin!!!P@s7$$gJGoNM5Q?95!<<)a!!*-#rVus(r:L$j +++X7h!>",f!!#7JrrD!V!:0Xbq#16n+1hLArr@TK!!aVGn,NFns8M9`!_rVup_o)J^i!.XnG +!9!hVq#:Eb!!i8u!;QNn!'e'pnG`K=r;Zg.rVllqkl:_bs8E!!#Q45p!'g>\!=.Q^!!#7Trr`0! +!$D+\!=/,n!!#7T +rr_`j!!iE$!9!hVq#C\!=/,n +!!#7Ts8;otJ,K-!WW-!!=/Pq!!#7\!!*>orVup_ +o`"pjr;Zg^r;QcTrW)co!9!hV!!E#r!;QNn!'e'pnG`K=hZ*ZXs8E!!#Q45p!$D(UGFr;cWm!;QNn!'e'pnG`K=hZ*ZXs8E!!#Q45p!?Zji!!*VgrVup_o`"p\ +r;Zg&r;QcTrW)coqu?_Hq>UHirVup_])V:"!.`r,!UHirVup_])V:"!.`r,!UHirVup_])V:"!.`r,!UHirVup_])V:"!.`r,!!!D!!+1WrVup_o`"oAquHZp +!9!hVqYpQjqu?^-q>UHirVup_])V:"!.`r,!UHirVup_])V:"!.`r,!UHirVup_])V:"!.`r,!$VrqcZq5Q1T^i;N`Q +rrD!T!!!,srrDin!!#6ps7$$gJDU>-!WW-!!=/Pq!!*2squ?`sr;Zg^p&>$kqZ$U\rVllUrW)fp +!9!bT!!E&s!;QNn!'e'pnG`K=hZ*ZXs8E!!#Q45p!UHirVup_])V:"!.`r,!!9!hVqYpQ2 +qu?]tq>UHirVup_])V:"!.`r,!i;N`QrrBk4 +!!!&qrrDin!!#6ps7$$gJDU>-!WW-!!=/Pp!!.S"rVus0q#(0m5PtH\i:R'M+8u3>i;N`QrrBk4 +!!!&qrrDin!!#6ps7$$gJDU>-!WW-!!=/Pp!!,="rVus@nGN=e5PtH\_"@[-+8u3>i;N`QrrBk4 +!!!&qrrDin!!#6ps7$$gJDU>-!WW-!!=/Pp!!,=BrVus`i;EWU5PtH\JFrmB+8u3>i;N`QrrBk4 +!!!&qrrDin!!#6ps7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655PtKQ!!",>rrD!V!;c]q_#+04 +!Vu`qq#16n5J$marr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7]rrE&j!!",>rrD!V!;c]q_#+04 +!Vu`qq#16n5J$marr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7]rrDuh!!",>rrD!V!;c]q_#+04 +!Vu`qq#16n5J$marr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7]rrDid!!",>rrD!V!;c]q_#+04 +!Vu`qq#16n5J$marr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7]rrDQ\!!#7^rrD!V!;c]qi;-!WW-!!=/Pp!!+22rVutK_#4655Q1T^q""L`rrD!V!;c]qq"t*l&,Q;+q#(0m +5J$marr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7^rrDQ\!!!&trrD!V!;c]qr;6Np+8Z!;nGN=e +J%G[Lrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7^rrD!L!!!&trrD!V!;c]qr;6Np+8Z!;i;EWU +J%G[Lrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7^rrBk,!!!-!rrD!V!;c]qrql`r5PkB[_#48D +s7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q1T^JFigA#Q4T%i;N`Ps82isJ,90FJGfJYs7$$g +JDU>-!WW-!!=/Pp!!+22rVutK_#4655Q1WR!!!Q-rrD!V!;ZWpJGfKDs8;ot!P/7"rr@T,!!*-# +rVus(r:Bsi+7T70!Iqo`!!#7_rrE&i!!",=rrD!V!;ZWp_#=<6!W)frrqufs"1eI$rr@T,!!*-# +rVus(r:Bsi+7T70!Iqo`!!#7_rrDug!!#7]rrD!V!;ZWpi;N]V"8`#tr;?Tq#J'm(rr@T,!!*-# +rVus(r:Bsi+7T70!Iqo`!!#7_rrDic!!%NHrrD!V!;ZWpnGWCf#Q"H#q#(0m&%V`0rr@T,!!*-# +rVus(r:Bsi+7T70!Iqo`!!#7_rrDic!;lcri;N`PrrDin!!!Q+rrDQe!!"+Os7$$gJDU>-!WW-! +!=/Pp!!+22rVutK_#4655Q:Z_nFQ\\!W2lsi;N`PrrDur!!",;rrD!U!!#6os7$$gJDU>-!WW-! +!=/Pp!!+22rVutK_#4655Q:Z_nFQ\\#Q+N$i;N`Os8DuuJ,90F_#465J%>UKrr@T,!!*-#rVus( +r:Bsi+7T70!Iqo`!!#7_rrD!U!;lcuqu?^=qu6ZSrW)`n!l+d:q>UGFr;aA-nG`K=hZ*ZXs8E!! +#Q42o!?^h1!!.Sbr;Zg^rr2uVrVup!qZ$Qq!.XnG!9!hVq#:Eb!!i?"r;Zfu\Gu'u!.`r,!nG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sb +r;Zg^rr2uVrVup?nc&U)rW)Bd!:]pe!$A`NnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uV +rVup_nc&T>rW)Bd!9!eU!'e!nnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrVuqJnc/Of +mf*:&r;ZhIp\t9`#K6Z3rr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!:g'hrquibrr@TJ +!;?Hm!!%Mfs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`HrrDuq!:Kmc!!!&orr`0! +!$B2[nG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)co!Up?krrDim!;HKo!.XnG!<2os +!!Duq"7Q9j#K?`4rr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;ZZp!!%NHrrDQe!;QQq +n,N^jrrDuq!!!8urr^%:!!1(=nG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)fp"8i-! ++8l-=i;EZNrrTt9!W2lsq#(0m&,6)(JGoPfs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_ +i;N`Qrr_`j!!iH%!5SR6!!2lprVuqJr;Qcdr;Zg>p](0l!.W#gnG`K=hZ*ZXs8E!!#Q42o!?^h1 +!!.Sbr;Zg^rr2uVrW)fp"2Fm:!W;rtJGoNK!Vu`qr;HZr+8l-=i;EWU5PY6Yrqufs5K<`mrr@T, +!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;c]qJGoQHs8;ot"8Vrsq#16n&,cG-_#465J,'$D +r;?Tq+3+?Mrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;c`o!!%NJrrE&s!!!,srrDQf +!!!9%rr@TJ!;HKnq#(0m&'"Y=rr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;lcrrqufs +5Q:Z_r;?Tq#PnB"i;N]V"8r2t!!!&orrDQe!!!8Ds7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#465 +5Q:Z_i;N`RrrDuq!!",?rrDim!!!Q*rrBk6!!!&urrE&s!!!,qrrD!U!!!,@s7$$gJDU>-!WW-! +!=/Pp!!+22rVutK_#4655Q:Z_i;N`RrrDid!!",:rr@TA!!!8urrBk+!!%Mqs7$$gJDU>-!WW-! +!=/Pp!!+22rVutK_#4655Q:Z_i;N`RrrDQ\!!#7Zs763j&,6)(_".O++41&Wrr@T,!!*-#rVus( +r:Bsi+7T70!Iqo`!!#7_rrD!V!;lcri:I!LJ,90Frpp*i+8>d8JF`a@#LNM?rr@T,!!*-#rVus( +r:Bsi+7T70!Iqo`!!#7_rrD!V!;lcr_"7X&rrDug!!#7Xrr@T@!!!,Js7$$gJDU>-!WW-!!=/Pp +!!+22rVutK_#4655Q:Z_i;N`RrrBk-!!!&qrrDug!!%NCs7--i!RUl9rr@T,!!*-#rVus(r:Bsi ++7T70!Iqo`!!#7_rrD!V!;lcrJFrmB"8Vrsq""LZs7$*9s7$$gJDU>-!WW-!!=/Pp!!+22rVutK +_#4655Q:Z_i;N`Rrr@TB!!!9"rrDid!!!&orrE&g!!%Mrs7$$gJDU>-!WW-!!=/Pp!!+22rVutK +_#4655Q:Z_i;N`Rs7?9k&,H5*nFQ\\"8Dfqrp]sg5LKN#rr@T,!!*-#rVus(r:Bsi+7T70!Iqo` +!!#7_rrD!V!;lfg!!",:rrDQ\!!!8urrE&g!!"+gs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#465 +5Q:Z_i;N`SrrE&j!!#7ZrrD!L!!!Q(rrE&g!!!PWs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#465 +5Q:Z_i;N`SrrE&j!!%NErrD!L!!",8rrDue!!!8Os7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#465 +5Q:Z_i;N`SrrE&j!;QQoi:I!L5PP0Xr:'ae"4@/-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`S +rrDuj!!!&orrBk-!!%NBrrE&f!!!&Js7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`S +rrDuj!!!,qrrBk-!;6?lrpKj8s7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrE&l +!!!8urrD!N!!!&mrrE&e!!%Mts7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrE&l +!!!Q(rrD!N!!!,ns6fpf5L]Z%rr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;uisrq6d8i:[-N#PA&b!!"+is7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrE&l!!#7X +rrD!N!!!Q%rr@T=!!!PYs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Rs7QEmJ+rsC +nFch^+8#R5JFEO=#Li_Brr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;lfj!!!&nrrDQ^ +!!%N@rrBk(!!!,Ms7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Rrr@TE!!!8trrDig +!!!&krrBk(!!!&Ks7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Rrr@TI!:g'hq"t*l +&+9Gti;EWU"8VrsJGfJss7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`RrrBk5!!!&i +rrDup!!",/rrDQe!!!9"rrBk5!!%Mus7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`R +rrBk5!!!&irrDup!!",/rrDim!!!Q*rrD!U!!#75s7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#465 +5Q:Z_i;N`RrrD!U!!!,krrE&r!!#7OrrDuq!!",:rrDQe!!#75s7$$gJDU>-!WW-!!=/Pp!!+22 +rVutK_#4655Q:Z_i;N`RrrDQe!!!8ns82isJ+!=:rqufs5Pb[rr@T,!!*-#rVus( +r:Bsi+7T70!Iqo`!!#7_rrD!V!;lcrq#(0m&+KT!JGfK7s8;otJ,0*Er;?Tq+4U>[rr@T,!!*-# +rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;lcrr;?Tq+7T:1_#=<6!UTgdJGoQDrrE&s!!!PZs7$$g +JDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`RrrE&s!!#7QrrD!V!!!,frr^%:!!2ior;Zg. +eGo%^Hp!.XG:!q60pli.(&!!!&orrDur!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_ +i;N`PrrMTom/I(dJ*[+:^]4?8p\t6mrVup/eGo%-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`!rr^%: +!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW(+@"2Fm:!VcTorr)lt +&(LXKrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!6Y-!WW-!!=/Pp +!!+22rVutK_#4655Q:Z_i;N`!rr^%:!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sb +r;Zg^rr2uVrW(+@"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V +!;ZWqn-A=[!<@W8rr^%:!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uV +rW)corr<%Kmf*@X!!hii"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_ +rrD!V!;c]tqu?^=mf*@(!!2Ec"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus(r:Bsi+7T70!Iqo` +!!#7_rrD!V!;c]tn,NFnmf37d!.XA8"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus(r:Bsi+7T70 +!Iqo`!!#7_rrD!V!;c]t^]4?8n,ECcrVup?m/I1'!!!&orrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp +!!+22rVutK_#4655Q:Z_i;N`Qrr@TK!:Tpfq#16n&+';u^]4?8p\t6mrVup/eGo%nG`L(rVup!m/I1'!!!&o +rrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`RrrDim!!!Q+rrMU2q>UGF +r;c3a"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;lcrnGN=e +#Q"H$^^']8qu?_HmJd:(!!!&orrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_ +i;N`RrrD!U!!!,trrE*#qYpQpqu?^]mJd:(!!!&orrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22 +rVutK_#4655Q:Z_i;N`RrrBk+!;c]qr;6Np+79(1^]4?8p\t6mrVup/eGo%- +!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Rrr@T@!!#7\rrDil!!!Psrr^%:!!2io!<2rt!"[TZ +nG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)iq!.aY@!$D+-0!!!&orrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrE&h!!!,u +rrD!L!!!,orr^%:!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)lr +!<2Nh!!2us!9!JL!!2cm"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_ +rrD!V!;uisrp^!crrD!K!;6?o^]4?8p\t6mrVup/eGo%-!WW-!!=/Pp!!+22 +rVutK_#4655Q:Z_i;N`SrrDue!!#7]rrBk+!!#7Wrr^%:!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!! +#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)lr!;u?e!$D.=!5S1+!$Cq7"2Fm:!VcTorr)lt&(LXKrr@T, +!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;uisr:'ae&,cG-_".O+&,-#*^]4?8p\t6mrVup/ +eGo%-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrDue!!!-!rrBk+!!!,p +rr^%:!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)lr!;u?e!!3#t +!5S1+!!2fn"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;uis +r9s^arrBk*!;?Ep^]4?8p\t6mrVup/eGo%p\t?2!!!&orrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#465 +5Q:Z_i;N`SrrDud!!#7^rrBk*!!#7Xrr^%:!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1 +!!.Sbr;Zg^rr2uVrW)lr!<2Hf!$D1>!9!DJ!$Ct8"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus( +r:Bsi+7T70!Iqo`!!#7_rrD!V!;uisrpTmf&,lM.i:6jJ&,6)+^]4?8p\t6mrVup/eGo%-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrE&f!!!-"rrD!J!!!,qrr^%:!!2io +!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)iqn,NFhrVllenc/Xlp\t?2 +!!!&orrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Rs6fsdrrDQZ!!!&o +rr^%:!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)iq!.aP=!.Y"J +!;Q*b!!2io"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;lcr +JFEO=5Q:Z_q!e@Yrr^%:!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uV +rW)iq!5S((!$D4?!;u?ep\t?2!!!&orrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#465 +5Q:Z_i;N`RrrBk(!!!Q/rrDue!;HKq^]4?8p\t6mrVup/eGo%^Bn!!3&u!.aV?p\t?2 +!!!&orrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`RrrDuq!!",:rr@TJ +!<)ot_#=<6!W)frJGoQCrr^%:!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^ +rr2uVrW)iq!<2os!'g;Z!5SO5!.Y"J!9!hV!!E)t!5SR6p\t?2!!!&orrE&t!!!PZs7$$gJDU>- +!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Qs8;otJ,0*Ei;EWU5Q:Z_nGWCf#Q"H#i;N`Nrr^%: +!!2io!<2rt!"[TZnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)fp!.b%Kq#:?`r;Zg> +rr2unrVup/qYpQRrW)]m"2Fm:!VcTorr)lt&(LXKrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_ +rrD!V!;c]t^]4?8q#:?hr;Zg.rr2urrVup?qYpQRrW)]m"2Fm:!VcTorr)lt&(LXKrr@T,!!*-# +rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;c]tn,NFnq#:?lr;Zg&rVuis!.XkF!9!hVp\t?2!!!&o +rrE&t!!!PZs7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Qrr`0!!$D"9!<2os!!E3" +!l+d:q>UHQrW)]m"2Fm:!VcTor;HZr#LreCrr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V +!;ZZp!!%NCs8;ot!WE$"n,N^hrrD!V!;HKq^]4?8p\t6grVup#eGo%UKb#PS/tJGfKGrrE+Lq>UHQrW)]m"2Fm:!VcTonGWCf!S%/=rr@T, +!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!:9^c_#465J+N[?i;N`Nrr^%:!!2io!9!eUeGo%< +!.`r,!-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Bs8;ot +!V?-!WW-!!=/Pp!!+22rVutK +_#4655Q:Z_i;N`Ps8N'!J+imB_#46:J,fQ- +!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Qrr`0!!$Cq7!9!eU"[E%e^]4E2rrD!V!;HKq^]4?8 +q#:?hqu?^!ec5.=!.`r,!rr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;c`o!!%NCrrE&s!!39&nGWCf#Q"H# +i;N`Nrr^%:!!2lp!:]md!!1XMnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)iq!<2os +!'g2Wr;Zm"s5-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`RrrDQe!!!8trrD!U!!#7]!!%NG +rrD!V!;HKq^]4?8q#:?PqZ,1HnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)iq!9!eU +!!Drp!:]pe!$;%-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Rrr@TE!!!,urrE&m!!!Q,rrD!V!;HKq^]4?8 +q#:?PqZ,1HnG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)iq!.ahE!!2rrpAb1(qu6ZS +rW)]m"2Fm:!VlZpi;3N)s7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Rs7QHhrr@TE +!!!9$rrD!V!;HKq^]4?8q#:?`qu?]tec5.=!.`r,!-!WW-!!=/Pp!!+22rVutK +_#4655Q:Z_i;N`SrrE&l!!#7\rrD!P!!!,urrD!V!;HKq^]4?8q#:?`qu?]tec5.=!.`r,!rr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;uisrq6-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_ +i;N`SrrDuj!!!,urrE&n!!!&srrD!V!;HKq^]4?8q#:?lqu?^%ec5.=!.`r,!- +!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrDui!;c]qJGB0F!W2lsi;N`Nrr^%:!!2lp!<2lr +!"[W[nG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uVrW)lr!;uKi!.XnG!5SC1!!2us!9!hV +p\t?2!!!&prrE&r!!!P[s7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrDui!!#7\ +rrD!Q!!!&srrD!V!;HKq^]4?8p](-k!$BbknG`K=hZ*ZXs8E!!#Q42o!?^h1!!.Sbr;Zg^rr2uV +rW)lr!;uKi!$D+-!WW-!!=/Pp!!+22 +rVutK_#4655Q:Z_i;N`SrrDui!!!Q,rrDii!!!&srrD!V!;HKq^]4?8p\t6/r;ZhIec5.=!.`r, +!-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrDui!!!,urrE&o!!!&srrD!V +!;HKq^]4?8p\t6_rVup!eGo%-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_ +i;N`SrrE&j!;c]qJGK6G"8i)ui;N`Nrr^%:!!2io!;ufr!!h$RnG`K=hZ*ZXs8E!!#Q42o!?^h1 +!!.Sbr;Zg^rr2uVrW)lr!<2Tj!.XnG!5SF2!!E,u!9!hVp\t?2!!!&orrE&t!!!PZs7$$gJDU>- +!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`SrrE&j!!#7\rrD!R!!!,urrD!V!;HKq^]4?8pAY5F +!!#75s7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#4655Q:Z_i;N`Rs7?9k+8c'rr@T,!!*-#rVus(r:Bsi+7T70!Iqo`!!#7_rrD!V!;lcr +JFrmB#Q+N$r;$Bn&,ZA,i;N`Nrr^%:!!2cm!J!D`s7$$gJDU>-!WW-!!=/Pp!!+22rVutK_#465 +5Q:Z_i;N`Rrr@TB!!!,urrE&p!!!Q,rrD!V!;HKq^]4?8`W,H-!.`r,!rr2unr;Zg.q>UH1rVup!qYpQRrW)]m"2Fm:!QG*.rr@T,!!+2"r;Zj_i:R'N+7T70!Iqo` +!!#7_rrD!V!;lcrrqufs5Q:Z_r;?Tq#PnB"i;N]V"8`#ti;N`Nrr^%:!!1(=nG`K=hZ*[A_#466 ++7Sq'!?^h1!!.Sbr;Zg^rr2uVrW)fpr;ZhIrr2utr;Zg"q>UHarVup'qYpQRrW)]m"2Fm:!QG*. +rr@T,!!,<7r;Zj/nFZb^+7T70!Iqo`!!#7_rrD!V!;c]qJGoQHs8;ot!Vu`qq#16n&,Q;+i;N`N +rr^%:!!1(=nG`K=hZ*Y+qu?a&q"4Uf+7T70!Iqo`!!#7_rrD!V!;c]t^]4?8r;QbIr;cZn!;ufr +!$D(;!9!hVp\t?2!!!&=s7$$gJDU>,J,B9I#Pdrl!?^h1!!.Sbr;Zg^rr2uVrW)fp"7Q9j#Q4T% +_#465J,0-D!!%NFrrD!V!;HKq^]4?8`W,H-!.`r,!<2lr!<`8m!!+22rVutK_#4655Q:Z_i;N`Q +rr`0!!$D.=!9!eU!'g;Z!l+d:q>UHQrW)]m"2Fm:!QG*.rr@T,!!*#r!!*3"o`,"7nGWCgJ&)!_ +!'gJ_!9!hVq>^Hp!.XqH!:]pe!$D%:!q60pq>UHQrW)]m"2Fm:!QG*.rr@T,!!)rp!!*,uo`,"7 +nGWCgJ&)!_!'gJ_!9!hVq>UKb#Q+N$q#(0m&,?/*!.XhE!9!hVp\t?2!!!&=s7$$gJDU>,r;6Nq +!W;Tj!?^h1!!.Sbr;Zg^rr2uVrW)Kg!;ucq!!hrl!9!hVp\t?2!!!&=s7$$gJD^D.!VlNl!<2Wk +!?^h1!!.Sbr;Zg^rr2uVrW)Kg!<2os!!DZh!9!hVp\t?2!!!&=s7$$gJD^D.!VlNl!<2Wk!?^h1 +!!.Sbr;Zg^rr2uVrW)Hfr;Zfumf*:FrW)]m"2Fm:!QG*.rr@T-!!*,qqZ$Wqo`,"7nGWCgJ&)!_ +!'gJ_!9!hVnG`K=r;c9c!9!hVp\t?2!!!&=s7$$gJD^D.!VlNl!<2Wk!?^h1!!.Sbr;Zg^rr2uV +rW)Hf!5SO5!.XJ;!9!hVp\t?2!!!&=s7$$gJD^D.!V#sd!.OS@!?^h1!!.Sbr;Zg^rr2uVrW)Hf +!9!eU!'frP!9!hVp\t?2!!!&=s7$$gJD^D."7Z0f!.OS@!?^h1!!.Sbr;Zg^rr2uVrW)Hf!:]pe +!$C\0!9!hVp\t?2!!!&=s7$$gJD^D."7Z0f!.XYA!?^h1!!.Sbr;Zg^rr2uVrW)co!Up?jrrDim +!!!Q*rrE+Lq>UHQrW)]m"2Fm:!QG*.rr@T-!!*2kqZ$VGo`,"7nGWCgJ&)!_!'gJ_!9!hVq>^Hp +!.XnG!;ucq!!iB#!q60pq>UHQrW)]m"2Fm:!QG*.rr@T-!!*2kqZ$VGo`,"7nGWCgJ&)!_!'gJ_ +!9!hVqYpZq!!",,r;6Nq!W;Tj!?^h1!!.Sbr;Zg^rr2uVrW)iq!9!eU!!E)tnc/YSqu6ZSrW)]m"2Fm: +!QG*.rr@T,!!)rp!!*,uo`,"7nGWCgJ&)!_!'gJ_!9!hVqu6Z3q#CC*rr2tKo)Jb4qu6ZSrW)]m +"2Fm:!QG*.rr@T,!!*#r!!*3"o`,"7nGWCgJ&)!_!'gJ_!9!hVqu6Z3q#CBsrr2u6o)Jb4qu6ZS +rW)]m"2Fm:!QG*.rr@T,!!%KG!!*2so`,"7nGWCgJ&)!_!'gJ_!9!hVqu6YHp]1,J,B9I#Pdrl!?^h1!!.Sbr;Zg^rr2uVrW)iq!.ahE"+U@NnFHV[ +&,ZA,i;N`Nrr^%:!!1(=nG`K=hZ*X@qu?a&nFZb^+7T70!Iqo`!!#7_rrD!V!;lfj!!>Ics7l0c +!!iE$!9!hVp\t?2!!!&=s7$$gJDU>-5Ci\4!>"\m!!,=RrVutK_#4655Q:Z_i;N`Rs7ZKq+92B= +o)Jaqqu6ZSrW)]m"2Fm:!QG*.rr@T,!!+1Wr;Zj?i:R'NJ+3F;!Iqo`!!#7_rrD!V!;uisrq?Bp +&-)\/o)Jamqu6ZSrW)]m"2Fm:!QG*.rr@T,!!+2"r;Zj__"@[.s7$!f!Iqo`!!#7_rrD!V!;uis +rq?Bm#QFbp!!!,urrD!V!;HKq^]4?8`W,H-!.`r,!>"\u!!.Sbp&G-ps7$!f!Iqo`!!#7_rrD!V +!;uisrq?Bm"9/<#JFigA"8i)ui;N`Nrr^%:!!1(=nG`K=hZ*Z^q#(0ns+'eC!X&JlrVutK_#465 +5Q:Z_i;N`SrrE&m!!!'!rrBk,!!!,urrD!V!;HKq^]4?8`W,H-!.`r,!<`9!!!*-#o`,$us5d`Z +^]4?Vr:L$j5QCZ^!Is&+!!#7_rrD!V!;uisr:U*m+92B=oDejlqu6ZSrW)]m"2Fm:!QG*.rr@T+ +!!RlA!!%NDo`,#BrquftJ)L8*!'gJ_!9!hVr;Qcpp&G1*s8W)j!!!&srrD!V!;HKq^]4?8`W,H- +!.`o+"X!XB!WV*N!!3,tr;ZkJ_#4655Q:Z_i;N`SrrDuj!!!9's7?9k!W2lsi;N`Nrr^%:!!1(= +nG`K=h>d]is1f`V_"Ia0!WVrn!!.Sbr;Zg^rr2uVrW)lr!;uNj!!E6#!.a_B!!2us!9!hVp\t6/ +rW'q;nG`K=h>dN\rVlkJp&G-rs7#se!Iqo`!!#7_rrD!V!;uisr:U*j!WN*!_"@[-!W2lsi;N`N +rrBk6!!%Mgs7$$gJDL8+!WN*!rq-6m#QN`\!!3,8r;Zg^rr2uVrW)lr!;uKirr2ufo`+smqu6ZS +rW)]m!5SR6!'eL'nG`K=h#RHS!;uKi!Y>=Hr;ZluJGfHJ5Q:Z_i;N`SrrE&k!!@`Ns8;Ni!!E,u +!9!hVp\t6/rVup?`rGQ.!.`l*"$chci:R'O+9-lj!!33$JGfHJ5Q:Z_i;N`SrrE&k!!#7YrrD!T +!!!,urrD!V!;HKn_#=<6&'"Y=rr@T*!!p!C-V_!!33$q"t*l5Q:Z_i;N`RrrD!U!!p!It+I!!39&q"t*l5Q:Z_i;N`RrrDQe!!Er;c]o!9!hV!.XbC +r;Zfua8bZ/!.`Aq!Wi>rr;Zm0s1nO4!'gJ_!9!hVqu6Zor;ZpAs8W)s!!!,rrrBk6!!!&rrrD!V +!!#7Xrr@TJ!6>-/rr@Sq!!39&nGN=g+9-lh!!#7_rrD!V!;lcrrqufs5Q:]]!!!&prrD!V!!!,t +rrD!V!!",8rrBk5!!%Mis7$$gJBn2s#QN`\!!,=aqZ$U\rr2uVrW)fpr;ZhIrr2tKr;cWm!:]sf +!!iB#!9!hV!"\i(!9!eU!'eR)nG`K=cN""Ws1nR5!It+G!!#7_rrD!V!;c]qJGoQIrrBk5!!%NE +rrDin!!!Q+rrD!V!!!8urrDQe!!"+^s7$$gJBn2s+9-li!!3,tqZ$U\rr2uVrW)fp"2Fm:!WE#u +i;EWU5PbrrDim!!!Q)rrTt9!Vu`qi;EZMrrE&s!!!,Bs7$$gJBn2rs8;fq!XJb`qZ$U\rr2uV +rW)corr<%KrVllqr;Zg&q#:Eb!!i?"!:]pe!.XbCr;ZfuaT(c0!.`Dr!Wi>rr;Zm0s1nL3!'gJ_ +!9!hVq>UKb#Q4T%rqufs"8Dfr!.XhE!:]pe!'g5X!.b"JaT(c0!.`Dr!X&Jlr;Zm@s+'tH!'gJ_ +!9!hVnc/Of!!2Ke!;QKm!$Ct8!5SO5!.W,jnG`K=ci=+Ps5^L[rr2uVrW)Kg!5SO5!.XG:!;ucq!!i8u +!:]pe!$B>_nG`K=ci=+hs+(%J!WW)o!!#7_rrD!V!:g'hi;EWU5OSOOrqufs"8Dfqq#(0m&'=k@ +rr@Sr!!,=ar;Zm"s7lEj!'gJ_!9!hVnc&UYr;Zg>mJm+b!!2io!;ucq!!gXGnG`K=ci=)rrqufu +"97le!!#7_rrD!V!:g'hq#(0m&+0AsJGfKBrrE&s!!!,Cs7$$gJC"8ss8;fq!XJb`q>^L[rr2uV +rW)Kg!;ucq!!hok!5SO5!.XbCr;ZfuaoCl1!.`Gs!Wi>rr;Zm0s1nI2!'gJ_!9!hVq>UKb#Q+N$ +rqufs"8Mls!.XeD!9!eU!'g5X!.b"JaoCl1!.`Gs!X&Jlr;Zm@s+'qG!'gJ_!9!hVq>^Hp!.XnG +r;Zfuq>UNc!!i=Hr;ZkJrqQNo5Q:Z_i;N`Qrr_`j +!!iE$!5SO5!.XkFrVuqJq>UHmr;Zg&p\t6_r;Zg>b5^u2!.`Gs![%Gmr;Zlur:pUHm +q>^L[qYpQbqZ$U\c2[;5!.`Jt![%Gmr;Zlur:g6l5Q:Z_i;N`RrrBk5!!!&srrD!U!!#7^rrDup +!!",:rrE&p!!!Q+rrDik!!!PSs7$$gJC4Du5QCZ^!Wi>rp](:Yrr2uVrW)iq!5SO5!!2us!:]pe +!$D1>!;u`p!$D"9q>^KtqYpQnqZ$Tuc2[;5!.`Jt!It+I!!39&nFut`5Q:Z_i;N`Rrr@TI!;lcr +q#(0m&,lM.q"t*l&,?/)JGT^9kc2[;5!.`Mu!Wi>rr;Zm0s1nC0!'gJ_!9!hVqu?Nn +!.XqH!<2os!!E3"!:]md!!i[!5SI3!'ed/nG`K=df9FSs5rr2uVqu?^!p]('i!!E)t!;u]o +!!COHnG`K=df9Durqufu"97lb!!#7_rrD!V!;uisr;-Ho+8c'^!!#7_rrD!V!;uisr;-Ho+8c'g?k!9!_ScN!D6!.`Q!!XJb@r;ZkJrq6pnG`K=e,TO\s+(%J!WW)k!!#7_rrD!V!;uis +r;-Ho+8Z!;i;EWX5QCc!qu?]tp\t6mq>^MFqYpQjqZ$VGciIcs1nO4!!2fnq>^MFqYpQnqZ$VGciCs1nO4!!2fn!.aqH!.XkF!;u]o!.W>pnG`K=e,TN!r;?Ts +#QN`U!!#7_rrD!V!;uisrqcZq5PkB[r;?Tt+92B!qu?^!pAY-.qZ$U\qYpQjqZ$U\ci[!;QEk!'eg0 +nG`K=eGoXOs7#se![%Gmp&G(Wrr2uVrW)lr!<2iq!'g;Zr;Zp1s8V$T!!!,prrDQc!!#7[rrDik +!!#70s7$$gJCOW$"97=Ho`+tVrr2uVrW)iq +!5SO5!!2lp!<2rt!tYG3r;6Np+85^7r;-HoJ,90Fr;-HoJ'\/arr@T#!!33$nGN=g+9-la!!#7_ +rrD!V!;lcri;EWU"8Mlrrr)m"&-)\/qu?^]pAY-jqZ$VGqYpQnqZ$VGcipnG`K= +ec5a^s+(%J!WW)i!!#7_rrD!V!;lcrr;?Tq+8Gj9rr)lt&,uS/_#=<6!VQHmrqc]krrE&q!7(W6 +rr@T#!!+2Ar;Zm"s7l3d!'gJ_!9!hVqu6Zqr;Zg^q#:?nrVup/rr2uVrVup#p&>$kqZ-Hl!<2iq +cN!D6!.`W#!C-S^!!39&nFQ\\5Q:Z_i;N`Qs8;otJ,'$Drr)lt&,uS/nGWCf#PA&o!!!&ps82is +!RC`7rr@T#!!.TIr;Zm(s5Er;Zg"cN!D6!.`Z$!Wi>jr;Zm@s+'_A!'gJ_!9!hV!.XnG"7Q9j#P\5urr)lt&,lP-!!%N@ +rr@TJ!!!,rrr@TJ!!!,Hs7$$gJCac&"97!'gJ_!9!hV!$D(;rr<%Kp\t6m +rVup/rVlrg!!i,q!9!eU!"\l)!9!eU!"[BTnG`K=f)Pj_s+(%J!WW)h!!#7_rrD!V!!!Q+rrMTo +pAY-lrVup/r;QctJ+N[?nGN=e+8Gj9nGN=e+3soUrr@T$!!+2Ar;Zm"s7#U[!'gJ_!9!hV!!hok +!<2rt!"\Gr!;QKm!'g8Y!;QKm!'ed/nG`K=f)Ph9rqufu"97<]r;Zluq!nCb5Q:Z_q#(0m&+9Gtrr)lt +&*s5srVurkrrW0"!6kK4rr@T%!!+2Ar;Zm"s7#RZ!'gJ_!;ucq!!hrl!<2rt!"\Ap!T4L\rrM$g +bl@24!.`]%!C-S^!!39&i:6jJ5Q:Z_rqufs"7H0hrr)lt&#B6prr@T%!!.TIr;Zm(s1n1*!'gG^ +r;Zfumf*:drVup/V#Tra!.`]%!WVrn!!3]2JFW[?5Q1T^JGfK9rrE&t!!!P*s7$$gJCso(!WVZf +!!+2AnGiPRrVll5r;ZhIn,ECerVup/V#Tra!.``&!X&J\r;Zj_rp]sg5Q1T^i;EWU5O\UPrr)lt +&#B6prr@T&!!3E*_#466J,Jg:!'gG^!:]pe!$C\0!<2rt!"Yn*nG`K=f`2'as+(%J!WVrb!!#7^ +rrDim!!!PurrE&t!!!P*s7$$gJCso'+929>!Wi>jnGiPRrVllqr;Zg&n,ECerVup/V#Tra!.``& +!C-S^!!39&i:-dI5Q1T^rqufs"7Q6irr)lt&#B6prr@T&!!.TIr;Zm(s1n.)!'gD]r;Zfun,ECe +rVup/V#Tra!.``&!WVrn!!3]2JFNU>5Q(N]JGfK:rrE&t!!!P*s7$$gJD'u)!WVZf!!+2An,NGQ +r;Qc4r;ZhInG`LfrVup/V#Tra!.`c'!X&J\r;Zj_rpTmf5Q(N]i;EWU5Oe[Qrr)lt&#B6prr@T' +!!3E*_#466J,Jd9!'gD]!:]pe!$C_1!<2rt!"Yn*nG`K=g&M0bs+(%J!WVra!!#7]rrDim!!!Q! +rrE&t!!!P*s7$$gJD'u(+929>!Wi>jn,NGQr;Qcpr;Zg&nG`LfrVup/V#Tra!.`c'!C-S^!!39& +i:$^H5Q(N]rqufs"7ZPqu6Z3r;ZhI +nc&UgrVup/V#Tra!.`f(!X&J\r;Zj_rpKge5PtH\i;EWU5OnaRrr)lt&#B6prr@T(!!3E*_#466 +J,Ja8!'gA\!:]pe!$Cb2!<2rt!"Yn*nG`K=gAh9cs+(%J!WVr`!!#7\rrDim!!!Q"rrE&t!!!P* +s7$$gJD1&)+929>!Wi>jmf3>Pqu6Zor;Zg&nc&UgrVup/V#Tra!.`f(!C-S^!!39&i9pXG5PtH\ +rqufs"7cBkrr)lt&#B6prr@T(!!.TIr;Zm(s1n('!'g>[r;Zfunc&UgrVup/V#Tra!.`f(!WVrn +!!3]2JF,+8u3>nGN=f+91a/!'g>[!5SO5!.XS>!<2rt +!"Yn*nG`K=hZ*X@rVllUr;Zj_rpBad5PkB[i;EWU5P"gSrr)lt&#B6prr@T,!!%NIrrBk5!!.TI +mJm5OqYpQbr;Zg>o)A^hrVup/V#Tra!.`r,r;QbIr;Zluq!J+^5PkB[q#(0m&+]`#rr)lt&#B6p +rr@T-!!!&ts8;p!!WVZW!!#7[rrDuq!!!8prrE&t!!!P*s7$$gJD^D-!WE#urqufu"97^Bn!!2Zj!<2rt!"Yn*nG`K=huEcY +nG*%c&-%1J!!#7Zrr@TJ!:p-irr)lt&#B6prr@T-!!*,iq#CF;s6Tdd5Pb^Qts7#CU!'g;Z!;ucq!!i,q!<2rt!"Yn*nG`K=huEcYnG3+d"97^O^O\rp0Ub5PY6Yi;EWU5P4sUrpToms7$$gJD^D.!V#pc!It%6!!#7YrrDQe!!",5rrE&f!!#6h +s7$$gJD^D.!V#pc!WVr]!!#7YrrDim!!!Q%rrE&f!!"+Hs7$$gJD^D.!V#sd!Wi>jli7#Mq#:?l +r;Zg&o`"pjn,NG!ZN'Fo!.`u-!$VrpKgeJ$]1Err@T-!!*,iqZ$X]r9F=_5PP0XnGN=e+8,X6rpKge5I:CZrr@T-!!*,iqZ$X] +q!.n[5PP0Xq#(0m&,#r&rpKge+1)":rr@T-!!*,iqZ$X]nEU&S5PP0Xr;?Tq#PJ)srpKge&$u<* +rr@T-!!*,iqZ$X]i9L@C5PP0Xrqufs"82ZorpKge#IFI"rr@T-!!*,iqZ$X]_!:t#5PG-U!!!&m +rrE&e!!!,-s7$$gJD^D.!V#sd!C),#!!#7Wrr@TJ!;6?lrpKge!OMgqrr@T-!!*2kqZ$U\l2UfK +pAY-.r;ZhIpAY-lmJsTnnG`K=huEc[nG<1c53`+J5PG*Wi;EWU5PG*WrpBadJ$f7Frr@T-!!*2k +qZ$U[l2UfKpAY-^r;Zg>p&FF[!'djjnG`K=huEc[nG<1c53`+J5PG*Wq#(0m&,#tj!!"+Js7$$g +JD^D."7Z0f!']ZJ!'g2W!;ucq!!i2s!.aM$V +JGfK@rrD!G!!!&,s7$$gJD^D."7Z0f!']ZJ!'g/V!5SO5!.X_B!:]CV[/]Xq!.`u-!<_ig!!#4J +!!#7VrrD!U!!#7WrrDi^!!%MVs7$$gJD^D."7Z0f!']ZJ!'g/V!:]pe!$Cq7!;u6b!'dmknG`K= +huEc[nG<1c53`+J5P>$Vq#(0m&,#tj!!"+Ks7$$gJD^D."7Z0f!']ZJ!'g/V!;ucq!!i2s!5S%' +!"ZL;nG`K=huEc[nG<1c53`+J5P>$Vrqufs"6][ar;?Tq#IXU$rr@T-!!*2kqZ$U[l2UfKo`+ji +!!29_!<2os!!BY/nG`K=huEc[nG<1c53`+J5P4sUJGfK1s8;ot!O_ssrr@T-!!*2kqZ$U[l2UfK +o`"p,r;ZhIkPkO4r;a8*nG`K=huEc[nG<1c53`+J5P4sUi;EWU5Ni%H_#465J%#CHrr@T-!!*2k +qZ$U[l2UfKo`"p\r;Zg>kPkP?r;Zg^[f>js!.`u-!<_ig!!#4J!!#7UrrDim!!!PmrrDQe!!"+L +s7$$gJD^D."7Z0f!']ZJ!'g,U!;ucq!!h]e!;QKm!"ZOkPkP?r;Zg^\,Yst +!.`u-!,"8i,_!!#7SrrD!U!!#7HrrBk5!!%MYs7$$gJA;-b5P"gSnGN=e ++6WY(i;EWU5Iga_rr@Sb!!#7SrrDim!!!PmrrDQe!!"+Ns7$$gJA;-b5P"gSr;?Tq#Nu*eq#(0m +&%MZ/rr@Sb!!#7SrrE&s!!!,arrDuq!!!86s7$$gJA;-b5OndP!!!&_rrE&s!!!,2s7$$gJA;-b +5OnaRJGfK1s8;ot!P&1!rr@Sb!!#7RrrBk5!!%N3rr@TJ!4`'urr@Sb!!#7RrrD!U!!#7HrrBk5 +!!%MZs7$$gJA;-b5OnaRnGN=e+6WY(i;EWU5Ipg`rr@Sb!!#7RrrDim!!!PmrrDQe!!"+Os7$$g +JA;-b5OnaRr;?Tq#Nu*eq#(0m&%V`0rr@Sb!!#7RrrE&s!!!,arrDuq!!!87s7$$gJA;-b5Oe^O +!!!&_rrE&s!!!,3s7$$gJA;-b5Oe[QJGfK1s8;ot!P/7"rr@Sb!!#7QrrBk5!!%N3rr@TJ!4i.! +rr@Sb!!#7QrrD!U!!#7HrrBk5!!%M[s7$$gJA;-b5Oe[QnGN=e+6WY(i;EWU5J$marr@Sb!!#7Q +rrDim!!!PmrrDQe!!"+Ps7$$gJA;-b5Oe[Qr;?Tq#Nu*eq#(0m&%_f1rr@Sb!!#7QrrE&s!!!,a +rrDuq!!!88s7$$gJA;-b5O\XN!!!&_rrE&s!!!,4s7$$gJA;-b5O\UPJGfK1s8;ot!P8=#rr@Sb +!!#7PrrBk5!!%N3rr@TJ!4r4"rr@Sb!!#7PrrD!U!!#7HrrBk5!!%M\s7$$gJA;-b5O\UPnGN=e ++6WY(i;EWU5J-sbrr@Sb!!#7PrrDim!!!PmrrDQe!!"+Qs7$$gJA;-b5O\UPr;?Tq#Nu*eq#(0m +&%hl2rr@Sb!!#7PrrE&s!!!,arrDuq!!!89s7$$gJA;-b5OSRM!!!&_rrE&s!!!,5s7$$gJA;-b +5OSOOJGfK1s8;ot!PAC$rr@Sb!!#7OrrBk5!!%N3rr@TJ!5&:#rr@Sb!!#7OrrD!U!!#7HrrBk5 +!!%M]s7$$gJA;-b5OSOOnGN=e+6WY(i;EWU5J7$crr@Sb!!#7OrrDim!!!PmrrDQe!!"+Rs7$$g +JA;-b5OSOOr;?Tq#Nu*eq#(0m&%qr3rr@Sb!!#7OrrE&s!!!,arrDuq!!!8:s7$$gJA;-b5OJLL +!!!&_rrE&s!!!,6s7$$gJA;-b5OJINJGfK1s8;ot!PJI%rr@Sb!!#7NrrBk5!!%N3rr@TJ!5/@$ +rr@Sb!!#7NrrD!U!!#7HrrBk5!!%M^s7$$gJA;-b5OJINnGN=e+6WY(i;EWU5J@*drr@Sb!!#7N +rrDim!!!PmrrDQe!!"+Ss7$$gJA;-b5OJINr;?Tq#Nu*eq#(0m&&rr@Sb!!#7NrrE&s!!!,a +rrDuq!!!8;s7$$gJA;-b5OAFK!!!&_rrE&s!!!,7s7$$gJA;-b5OACMJGfK1s8;ot!PSO&rr@Sb +!!#7MrrBk5!!%N3rr@TJ!58F%rr@Sb!!#7MrrD!U!!#7HrrBk5!!%M_s7$$gJA;-b5OACMnFln_ +#OVNki;EWU5JI0err@Sb!!#7MrrDig!!!8krrDQe!!*o=^]3g'!._ib!'fiM!;uQk!!hok!;QEk +!'e:!nG`K=^]4@!m/I(bpAb0umJd1aqZ$U,_#Np(!._ib!'ffLpAb0umJd1cqZ$Tu_#Np(!._ib +!'ffL!.ahE!!hljq>e>2nG`K=^]4@!li-t#p](:!m/I'9qZ$VG_>j$)!._ib!'ffL!9!VP!!hlj +!5SI3!'e="nG`K=^]4@!li-tSp](:!m/I(DqZ$U<_>j$)!._ib!'ffL!;Qj$)!._ib!'ffL!<2`n!!hlj!;u]o!!C(;nG`K=^]4@! +lMpVZ!!hlj!<2iq!!0q9nG`K=^]4@!lMgj7q#CC"li6e]_>j$)!._ib!'fcK!5SC1!!hii!.aqH +_>j$)!._ib!'fcK!9!YQ!!hii!5SI3!.VlcnG`K=^]4@!lMgkRq#CC"li-tCqZ$VG_Z0-*!._ib +!'fcK!;Q?i!!hii!:]jc!'e@#nG`K=^]4@!lMgk^q#CC"li-t[qZ$U\_Z0-*!._ib!'fcK!<2co +!!hii!;u]o!$B)XnG`K=^]4@!l2UPZ!!hii!<2iq!$B)XnG`K=^]4@!l2La6q>^L#lMp_]!$B)X +nG`K=^]4@!l2Lb!q>^L#lMp_]!$B)XnG`K=^]4@!l2LbAq>^L#li-taqZ$U,_Z0-*!._ib!'f`J +!:]gb!!hii!<2iq!"ZsHnG`K=^]4@!l2LbYq>^L#li-taqZ$U,_Z0-*!._ib!'f`J!;uZn!!hii +!<2iq!"ZsHnG`K=^]4@!l2Lb_q>^L#li-taqZ$U,_Z0-*!._ib!'f]Iq>^L#li-taqZ$U,_Z0-* +!._ib!'f]I!.aqH!!hii!<2iq!"ZsHnG`K=^]4@!kl1XuqZ$U$li-taqZ$U,_Z0-*!._ib!'f]I +!9!_S!!hii!<2iq!"ZsHnG`K=^]4@!kl1YPqZ$U$lMp_]!$B)XnG`K=^]4@!kl1YXqZ$U$lMp_] +!$B)XnG`K=^]4@!kl1Y\qZ$U$lMp_]!$B)XnG`K=^]4@!kl1Y^qZ$U$lMp_]!$B)XnG`K=^]4@! +kl1Y^qZ$U$lMgj7qu?^]_Z0-*!._ib!'f]I!<2iq!!hfh!.atI!'e@#nG`K=^]4@!kl1Y^qZ$U$ +lMgk"qu?_H_Z0-*!._ib!'f]I!<2iq!!hfh!5SL4!.VlcnG`K=^]4@!kl1Y^qZ$U$lMgkBquFS5 +nG`K=^]4@!kl1Y^qZ$U$lMgkBquFS5nG`K=^]4@!kl1Y^qZ$U$lMgkRr;Zfu_>j$)!._ib!'f]I +!<2iq!!hfh!;QKm!!C(;nG`K=^]4@!kl1Y^qZ$U$lMgk^r;Zg&_>j$)!._ib!'f]I!<2iq!!hfh +!<2os!"ZpGnG`K=^]4@!kl1Y^qZ$U$l2U\^!$B&WnG`K=^]4@!kl1Y^qZ$U$l2La6rVup__>j$) +!._ib!'f]I!<2iq!!hcg!5SR6!.VibnG`K=^]4@!kl1Y^qZ$U$l2LbArW'b6nG`K=^]4@!kl1Y^ +qZ$U$l2Lk\!!!,:s7$$gJA;-b5Nr+IrqcZq#O26jrVup/_#Np(!._ib!'f]I!<2iq!!h`f!e:88 +_#Np(!._ib!'f]I!<2iq!!h`f!Vcc3s7$$gJA;-b5D/ues0)HRs0)HRs0)HRs0)HRs0)HRs0)HR +s0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HR +s0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HR +s0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HR +s0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HR +s0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HRs0)HQ~> +%%EndData +showpage +%%Trailer +end +%%EOF Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/gcode_control_img.pdf and /tmp/7VS3dXhxjw/pcb-20110918/doc/gcode_control_img.pdf differ Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/gcode_control_img.png and /tmp/7VS3dXhxjw/pcb-20110918/doc/gcode_control_img.png differ diff -Nru pcb-20100929/doc/gcode.pcb pcb-20110918/doc/gcode.pcb --- pcb-20100929/doc/gcode.pcb 1970-01-01 00:00:00.000000000 +0000 +++ pcb-20110918/doc/gcode.pcb 2011-06-05 21:25:44.000000000 +0000 @@ -0,0 +1,1000 @@ +# release: pcb 20091103 +# date: Tue Feb 9 17:50:10 2010 +# user: amc (amc,/home/alberto,S-1-5-21-3544562028-792812758-4257637587-9314) +# host: ni28979b.office.amsiag.com + +# To read pcb files, the pcb version (or the cvs source date) must be >= the file version +FileVersion[20070407] + +PCB["" 280000 160000] + +Grid[1000.000000 0 0 0] +Cursor[0 0 0.000000] +PolyArea[200000000.000000] +Thermal[0.500000] +DRC[1000 1000 1000 1000 1500 1000] +Flags("showdrc,nameonpcb,swapstartdir,clearnew,snappin") +Groups("1,c:2,s:3:4:5:6:7:8") +Styles["Signal,4000,8000,3000,2000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"] + +Symbol(' ' 18) +( +) +Symbol('!' 12) +( + SymbolLine(0 45 0 50 8) + SymbolLine(0 10 0 35 8) +) +Symbol('"' 12) +( + SymbolLine(0 10 0 20 8) + SymbolLine(10 10 10 20 8) +) +Symbol('#' 12) +( + SymbolLine(0 35 20 35 8) + SymbolLine(0 25 20 25 8) + SymbolLine(15 20 15 40 8) + SymbolLine(5 20 5 40 8) +) +Symbol('$' 12) +( + SymbolLine(15 15 20 20 8) + SymbolLine(5 15 15 15 8) + SymbolLine(0 20 5 15 8) + SymbolLine(0 20 0 25 8) + SymbolLine(0 25 5 30 8) + SymbolLine(5 30 15 30 8) + SymbolLine(15 30 20 35 8) + SymbolLine(20 35 20 40 8) + SymbolLine(15 45 20 40 8) + SymbolLine(5 45 15 45 8) + SymbolLine(0 40 5 45 8) + SymbolLine(10 10 10 50 8) +) +Symbol('%' 12) +( + SymbolLine(0 15 0 20 8) + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 10 10 8) + SymbolLine(10 10 15 15 8) + SymbolLine(15 15 15 20 8) + SymbolLine(10 25 15 20 8) + SymbolLine(5 25 10 25 8) + SymbolLine(0 20 5 25 8) + SymbolLine(0 50 40 10 8) + SymbolLine(35 50 40 45 8) + SymbolLine(40 40 40 45 8) + SymbolLine(35 35 40 40 8) + SymbolLine(30 35 35 35 8) + SymbolLine(25 40 30 35 8) + SymbolLine(25 40 25 45 8) + SymbolLine(25 45 30 50 8) + SymbolLine(30 50 35 50 8) +) +Symbol('&' 12) +( + SymbolLine(0 45 5 50 8) + SymbolLine(0 15 0 25 8) + SymbolLine(0 15 5 10 8) + SymbolLine(0 35 15 20 8) + SymbolLine(5 50 10 50 8) + SymbolLine(10 50 20 40 8) + SymbolLine(0 25 25 50 8) + SymbolLine(5 10 10 10 8) + SymbolLine(10 10 15 15 8) + SymbolLine(15 15 15 20 8) + SymbolLine(0 35 0 45 8) +) +Symbol(''' 12) +( + SymbolLine(0 20 10 10 8) +) +Symbol('(' 12) +( + SymbolLine(0 45 5 50 8) + SymbolLine(0 15 5 10 8) + SymbolLine(0 15 0 45 8) +) +Symbol(')' 12) +( + SymbolLine(0 10 5 15 8) + SymbolLine(5 15 5 45 8) + SymbolLine(0 50 5 45 8) +) +Symbol('*' 12) +( + SymbolLine(0 20 20 40 8) + SymbolLine(0 40 20 20 8) + SymbolLine(0 30 20 30 8) + SymbolLine(10 20 10 40 8) +) +Symbol('+' 12) +( + SymbolLine(0 30 20 30 8) + SymbolLine(10 20 10 40 8) +) +Symbol(',' 12) +( + SymbolLine(0 60 10 50 8) +) +Symbol('-' 12) +( + SymbolLine(0 30 20 30 8) +) +Symbol('.' 12) +( + SymbolLine(0 50 5 50 8) +) +Symbol('/' 12) +( + SymbolLine(0 45 30 15 8) +) +Symbol('0' 12) +( + SymbolLine(0 45 5 50 8) + SymbolLine(0 15 0 45 8) + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 15 10 8) + SymbolLine(15 10 20 15 8) + SymbolLine(20 15 20 45 8) + SymbolLine(15 50 20 45 8) + SymbolLine(5 50 15 50 8) + SymbolLine(0 40 20 20 8) +) +Symbol('1' 12) +( + SymbolLine(5 50 15 50 8) + SymbolLine(10 10 10 50 8) + SymbolLine(0 20 10 10 8) +) +Symbol('2' 12) +( + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 20 10 8) + SymbolLine(20 10 25 15 8) + SymbolLine(25 15 25 25 8) + SymbolLine(0 50 25 25 8) + SymbolLine(0 50 25 50 8) +) +Symbol('3' 12) +( + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 15 10 8) + SymbolLine(15 10 20 15 8) + SymbolLine(20 15 20 45 8) + SymbolLine(15 50 20 45 8) + SymbolLine(5 50 15 50 8) + SymbolLine(0 45 5 50 8) + SymbolLine(5 30 20 30 8) +) +Symbol('4' 12) +( + SymbolLine(0 30 20 10 8) + SymbolLine(0 30 25 30 8) + SymbolLine(20 10 20 50 8) +) +Symbol('5' 12) +( + SymbolLine(0 10 20 10 8) + SymbolLine(0 10 0 30 8) + SymbolLine(0 30 5 25 8) + SymbolLine(5 25 15 25 8) + SymbolLine(15 25 20 30 8) + SymbolLine(20 30 20 45 8) + SymbolLine(15 50 20 45 8) + SymbolLine(5 50 15 50 8) + SymbolLine(0 45 5 50 8) +) +Symbol('6' 12) +( + SymbolLine(15 10 20 15 8) + SymbolLine(5 10 15 10 8) + SymbolLine(0 15 5 10 8) + SymbolLine(0 15 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(15 30 20 35 8) + SymbolLine(0 30 15 30 8) + SymbolLine(5 50 15 50 8) + SymbolLine(15 50 20 45 8) + SymbolLine(20 35 20 45 8) +) +Symbol('7' 12) +( + SymbolLine(0 50 25 25 8) + SymbolLine(25 10 25 25 8) + SymbolLine(0 10 25 10 8) +) +Symbol('8' 12) +( + SymbolLine(0 45 5 50 8) + SymbolLine(0 35 0 45 8) + SymbolLine(0 35 5 30 8) + SymbolLine(5 30 15 30 8) + SymbolLine(15 30 20 35 8) + SymbolLine(20 35 20 45 8) + SymbolLine(15 50 20 45 8) + SymbolLine(5 50 15 50 8) + SymbolLine(0 25 5 30 8) + SymbolLine(0 15 0 25 8) + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 15 10 8) + SymbolLine(15 10 20 15 8) + SymbolLine(20 15 20 25 8) + SymbolLine(15 30 20 25 8) +) +Symbol('9' 12) +( + SymbolLine(0 50 20 30 8) + SymbolLine(20 15 20 30 8) + SymbolLine(15 10 20 15 8) + SymbolLine(5 10 15 10 8) + SymbolLine(0 15 5 10 8) + SymbolLine(0 15 0 25 8) + SymbolLine(0 25 5 30 8) + SymbolLine(5 30 20 30 8) +) +Symbol(':' 12) +( + SymbolLine(0 25 5 25 8) + SymbolLine(0 35 5 35 8) +) +Symbol(';' 12) +( + SymbolLine(0 50 10 40 8) + SymbolLine(10 25 10 30 8) +) +Symbol('<' 12) +( + SymbolLine(0 30 10 20 8) + SymbolLine(0 30 10 40 8) +) +Symbol('=' 12) +( + SymbolLine(0 25 20 25 8) + SymbolLine(0 35 20 35 8) +) +Symbol('>' 12) +( + SymbolLine(0 20 10 30 8) + SymbolLine(0 40 10 30 8) +) +Symbol('?' 12) +( + SymbolLine(10 30 10 35 8) + SymbolLine(10 45 10 50 8) + SymbolLine(0 15 0 20 8) + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 15 10 8) + SymbolLine(15 10 20 15 8) + SymbolLine(20 15 20 20 8) + SymbolLine(10 30 20 20 8) +) +Symbol('@' 12) +( + SymbolLine(0 10 0 40 8) + SymbolLine(0 40 10 50 8) + SymbolLine(10 50 40 50 8) + SymbolLine(50 35 50 10 8) + SymbolLine(50 10 40 0 8) + SymbolLine(40 0 10 0 8) + SymbolLine(10 0 0 10 8) + SymbolLine(15 20 15 30 8) + SymbolLine(15 30 20 35 8) + SymbolLine(20 35 30 35 8) + SymbolLine(30 35 35 30 8) + SymbolLine(35 30 40 35 8) + SymbolLine(35 30 35 15 8) + SymbolLine(35 20 30 15 8) + SymbolLine(20 15 30 15 8) + SymbolLine(20 15 15 20 8) + SymbolLine(40 35 50 35 8) +) +Symbol('A' 12) +( + SymbolLine(0 15 0 50 8) + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 20 10 8) + SymbolLine(20 10 25 15 8) + SymbolLine(25 15 25 50 8) + SymbolLine(0 30 25 30 8) +) +Symbol('B' 12) +( + SymbolLine(0 50 20 50 8) + SymbolLine(20 50 25 45 8) + SymbolLine(25 35 25 45 8) + SymbolLine(20 30 25 35 8) + SymbolLine(5 30 20 30 8) + SymbolLine(5 10 5 50 8) + SymbolLine(0 10 20 10 8) + SymbolLine(20 10 25 15 8) + SymbolLine(25 15 25 25 8) + SymbolLine(20 30 25 25 8) +) +Symbol('C' 12) +( + SymbolLine(5 50 20 50 8) + SymbolLine(0 45 5 50 8) + SymbolLine(0 15 0 45 8) + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 20 10 8) +) +Symbol('D' 12) +( + SymbolLine(5 10 5 50 8) + SymbolLine(20 10 25 15 8) + SymbolLine(25 15 25 45 8) + SymbolLine(20 50 25 45 8) + SymbolLine(0 50 20 50 8) + SymbolLine(0 10 20 10 8) +) +Symbol('E' 12) +( + SymbolLine(0 30 15 30 8) + SymbolLine(0 50 20 50 8) + SymbolLine(0 10 0 50 8) + SymbolLine(0 10 20 10 8) +) +Symbol('F' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(0 10 20 10 8) + SymbolLine(0 30 15 30 8) +) +Symbol('G' 12) +( + SymbolLine(20 10 25 15 8) + SymbolLine(5 10 20 10 8) + SymbolLine(0 15 5 10 8) + SymbolLine(0 15 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(5 50 20 50 8) + SymbolLine(20 50 25 45 8) + SymbolLine(25 35 25 45 8) + SymbolLine(20 30 25 35 8) + SymbolLine(10 30 20 30 8) +) +Symbol('H' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(25 10 25 50 8) + SymbolLine(0 30 25 30 8) +) +Symbol('I' 12) +( + SymbolLine(0 10 10 10 8) + SymbolLine(5 10 5 50 8) + SymbolLine(0 50 10 50 8) +) +Symbol('J' 12) +( + SymbolLine(0 10 15 10 8) + SymbolLine(15 10 15 45 8) + SymbolLine(10 50 15 45 8) + SymbolLine(5 50 10 50 8) + SymbolLine(0 45 5 50 8) +) +Symbol('K' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(0 30 20 10 8) + SymbolLine(0 30 20 50 8) +) +Symbol('L' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(0 50 20 50 8) +) +Symbol('M' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(0 10 15 25 8) + SymbolLine(15 25 30 10 8) + SymbolLine(30 10 30 50 8) +) +Symbol('N' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(0 10 0 15 8) + SymbolLine(0 15 25 40 8) + SymbolLine(25 10 25 50 8) +) +Symbol('O' 12) +( + SymbolLine(0 15 0 45 8) + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 15 10 8) + SymbolLine(15 10 20 15 8) + SymbolLine(20 15 20 45 8) + SymbolLine(15 50 20 45 8) + SymbolLine(5 50 15 50 8) + SymbolLine(0 45 5 50 8) +) +Symbol('P' 12) +( + SymbolLine(5 10 5 50 8) + SymbolLine(0 10 20 10 8) + SymbolLine(20 10 25 15 8) + SymbolLine(25 15 25 25 8) + SymbolLine(20 30 25 25 8) + SymbolLine(5 30 20 30 8) +) +Symbol('Q' 12) +( + SymbolLine(0 15 0 45 8) + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 15 10 8) + SymbolLine(15 10 20 15 8) + SymbolLine(20 15 20 45 8) + SymbolLine(15 50 20 45 8) + SymbolLine(5 50 15 50 8) + SymbolLine(0 45 5 50 8) + SymbolLine(10 40 20 50 8) +) +Symbol('R' 12) +( + SymbolLine(0 10 20 10 8) + SymbolLine(20 10 25 15 8) + SymbolLine(25 15 25 25 8) + SymbolLine(20 30 25 25 8) + SymbolLine(5 30 20 30 8) + SymbolLine(5 10 5 50 8) + SymbolLine(5 30 25 50 8) +) +Symbol('S' 12) +( + SymbolLine(20 10 25 15 8) + SymbolLine(5 10 20 10 8) + SymbolLine(0 15 5 10 8) + SymbolLine(0 15 0 25 8) + SymbolLine(0 25 5 30 8) + SymbolLine(5 30 20 30 8) + SymbolLine(20 30 25 35 8) + SymbolLine(25 35 25 45 8) + SymbolLine(20 50 25 45 8) + SymbolLine(5 50 20 50 8) + SymbolLine(0 45 5 50 8) +) +Symbol('T' 12) +( + SymbolLine(0 10 20 10 8) + SymbolLine(10 10 10 50 8) +) +Symbol('U' 12) +( + SymbolLine(0 10 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(5 50 15 50 8) + SymbolLine(15 50 20 45 8) + SymbolLine(20 10 20 45 8) +) +Symbol('V' 12) +( + SymbolLine(0 10 0 40 8) + SymbolLine(0 40 10 50 8) + SymbolLine(10 50 20 40 8) + SymbolLine(20 10 20 40 8) +) +Symbol('W' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(0 50 15 35 8) + SymbolLine(15 35 30 50 8) + SymbolLine(30 10 30 50 8) +) +Symbol('X' 12) +( + SymbolLine(0 10 0 15 8) + SymbolLine(0 15 25 40 8) + SymbolLine(25 40 25 50 8) + SymbolLine(0 40 0 50 8) + SymbolLine(0 40 25 15 8) + SymbolLine(25 10 25 15 8) +) +Symbol('Y' 12) +( + SymbolLine(0 10 0 15 8) + SymbolLine(0 15 10 25 8) + SymbolLine(10 25 20 15 8) + SymbolLine(20 10 20 15 8) + SymbolLine(10 25 10 50 8) +) +Symbol('Z' 12) +( + SymbolLine(0 10 25 10 8) + SymbolLine(25 10 25 15 8) + SymbolLine(0 40 25 15 8) + SymbolLine(0 40 0 50 8) + SymbolLine(0 50 25 50 8) +) +Symbol('[' 12) +( + SymbolLine(0 10 5 10 8) + SymbolLine(0 10 0 50 8) + SymbolLine(0 50 5 50 8) +) +Symbol('\' 12) +( + SymbolLine(0 15 30 45 8) +) +Symbol(']' 12) +( + SymbolLine(0 10 5 10 8) + SymbolLine(5 10 5 50 8) + SymbolLine(0 50 5 50 8) +) +Symbol('^' 12) +( + SymbolLine(0 15 5 10 8) + SymbolLine(5 10 10 15 8) +) +Symbol('_' 12) +( + SymbolLine(0 50 20 50 8) +) +Symbol('a' 12) +( + SymbolLine(15 30 20 35 8) + SymbolLine(5 30 15 30 8) + SymbolLine(0 35 5 30 8) + SymbolLine(0 35 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(20 30 20 45 8) + SymbolLine(20 45 25 50 8) + SymbolLine(5 50 15 50 8) + SymbolLine(15 50 20 45 8) +) +Symbol('b' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(0 45 5 50 8) + SymbolLine(5 50 15 50 8) + SymbolLine(15 50 20 45 8) + SymbolLine(20 35 20 45 8) + SymbolLine(15 30 20 35 8) + SymbolLine(5 30 15 30 8) + SymbolLine(0 35 5 30 8) +) +Symbol('c' 12) +( + SymbolLine(5 30 20 30 8) + SymbolLine(0 35 5 30 8) + SymbolLine(0 35 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(5 50 20 50 8) +) +Symbol('d' 12) +( + SymbolLine(20 10 20 50 8) + SymbolLine(15 50 20 45 8) + SymbolLine(5 50 15 50 8) + SymbolLine(0 45 5 50 8) + SymbolLine(0 35 0 45 8) + SymbolLine(0 35 5 30 8) + SymbolLine(5 30 15 30 8) + SymbolLine(15 30 20 35 8) +) +Symbol('e' 12) +( + SymbolLine(5 50 20 50 8) + SymbolLine(0 45 5 50 8) + SymbolLine(0 35 0 45 8) + SymbolLine(0 35 5 30 8) + SymbolLine(5 30 15 30 8) + SymbolLine(15 30 20 35 8) + SymbolLine(0 40 20 40 8) + SymbolLine(20 40 20 35 8) +) +Symbol('f' 10) +( + SymbolLine(5 15 5 50 8) + SymbolLine(5 15 10 10 8) + SymbolLine(10 10 15 10 8) + SymbolLine(0 30 10 30 8) +) +Symbol('g' 12) +( + SymbolLine(15 30 20 35 8) + SymbolLine(5 30 15 30 8) + SymbolLine(0 35 5 30 8) + SymbolLine(0 35 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(5 50 15 50 8) + SymbolLine(15 50 20 45 8) + SymbolLine(0 60 5 65 8) + SymbolLine(5 65 15 65 8) + SymbolLine(15 65 20 60 8) + SymbolLine(20 30 20 60 8) +) +Symbol('h' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(0 35 5 30 8) + SymbolLine(5 30 15 30 8) + SymbolLine(15 30 20 35 8) + SymbolLine(20 35 20 50 8) +) +Symbol('i' 10) +( + SymbolLine(0 20 0 25 8) + SymbolLine(0 35 0 50 8) +) +Symbol('j' 10) +( + SymbolLine(5 20 5 25 8) + SymbolLine(5 35 5 60 8) + SymbolLine(0 65 5 60 8) +) +Symbol('k' 12) +( + SymbolLine(0 10 0 50 8) + SymbolLine(0 35 15 50 8) + SymbolLine(0 35 10 25 8) +) +Symbol('l' 10) +( + SymbolLine(0 10 0 45 8) + SymbolLine(0 45 5 50 8) +) +Symbol('m' 12) +( + SymbolLine(5 35 5 50 8) + SymbolLine(5 35 10 30 8) + SymbolLine(10 30 15 30 8) + SymbolLine(15 30 20 35 8) + SymbolLine(20 35 20 50 8) + SymbolLine(20 35 25 30 8) + SymbolLine(25 30 30 30 8) + SymbolLine(30 30 35 35 8) + SymbolLine(35 35 35 50 8) + SymbolLine(0 30 5 35 8) +) +Symbol('n' 12) +( + SymbolLine(5 35 5 50 8) + SymbolLine(5 35 10 30 8) + SymbolLine(10 30 15 30 8) + SymbolLine(15 30 20 35 8) + SymbolLine(20 35 20 50 8) + SymbolLine(0 30 5 35 8) +) +Symbol('o' 12) +( + SymbolLine(0 35 0 45 8) + SymbolLine(0 35 5 30 8) + SymbolLine(5 30 15 30 8) + SymbolLine(15 30 20 35 8) + SymbolLine(20 35 20 45 8) + SymbolLine(15 50 20 45 8) + SymbolLine(5 50 15 50 8) + SymbolLine(0 45 5 50 8) +) +Symbol('p' 12) +( + SymbolLine(5 35 5 65 8) + SymbolLine(0 30 5 35 8) + SymbolLine(5 35 10 30 8) + SymbolLine(10 30 20 30 8) + SymbolLine(20 30 25 35 8) + SymbolLine(25 35 25 45 8) + SymbolLine(20 50 25 45 8) + SymbolLine(10 50 20 50 8) + SymbolLine(5 45 10 50 8) +) +Symbol('q' 12) +( + SymbolLine(20 35 20 65 8) + SymbolLine(15 30 20 35 8) + SymbolLine(5 30 15 30 8) + SymbolLine(0 35 5 30 8) + SymbolLine(0 35 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(5 50 15 50 8) + SymbolLine(15 50 20 45 8) +) +Symbol('r' 12) +( + SymbolLine(5 35 5 50 8) + SymbolLine(5 35 10 30 8) + SymbolLine(10 30 20 30 8) + SymbolLine(0 30 5 35 8) +) +Symbol('s' 12) +( + SymbolLine(5 50 20 50 8) + SymbolLine(20 50 25 45 8) + SymbolLine(20 40 25 45 8) + SymbolLine(5 40 20 40 8) + SymbolLine(0 35 5 40 8) + SymbolLine(0 35 5 30 8) + SymbolLine(5 30 20 30 8) + SymbolLine(20 30 25 35 8) + SymbolLine(0 45 5 50 8) +) +Symbol('t' 10) +( + SymbolLine(5 10 5 45 8) + SymbolLine(5 45 10 50 8) + SymbolLine(0 25 10 25 8) +) +Symbol('u' 12) +( + SymbolLine(0 30 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(5 50 15 50 8) + SymbolLine(15 50 20 45 8) + SymbolLine(20 30 20 45 8) +) +Symbol('v' 12) +( + SymbolLine(0 30 0 40 8) + SymbolLine(0 40 10 50 8) + SymbolLine(10 50 20 40 8) + SymbolLine(20 30 20 40 8) +) +Symbol('w' 12) +( + SymbolLine(0 30 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(5 50 10 50 8) + SymbolLine(10 50 15 45 8) + SymbolLine(15 30 15 45 8) + SymbolLine(15 45 20 50 8) + SymbolLine(20 50 25 50 8) + SymbolLine(25 50 30 45 8) + SymbolLine(30 30 30 45 8) +) +Symbol('x' 12) +( + SymbolLine(0 30 20 50 8) + SymbolLine(0 50 20 30 8) +) +Symbol('y' 12) +( + SymbolLine(0 30 0 45 8) + SymbolLine(0 45 5 50 8) + SymbolLine(20 30 20 60 8) + SymbolLine(15 65 20 60 8) + SymbolLine(5 65 15 65 8) + SymbolLine(0 60 5 65 8) + SymbolLine(5 50 15 50 8) + SymbolLine(15 50 20 45 8) +) +Symbol('z' 12) +( + SymbolLine(0 30 20 30 8) + SymbolLine(0 50 20 30 8) + SymbolLine(0 50 20 50 8) +) +Symbol('{' 12) +( + SymbolLine(5 15 10 10 8) + SymbolLine(5 15 5 25 8) + SymbolLine(0 30 5 25 8) + SymbolLine(0 30 5 35 8) + SymbolLine(5 35 5 45 8) + SymbolLine(5 45 10 50 8) +) +Symbol('|' 12) +( + SymbolLine(0 10 0 50 8) +) +Symbol('}' 12) +( + SymbolLine(0 10 5 15 8) + SymbolLine(5 15 5 25 8) + SymbolLine(5 25 10 30 8) + SymbolLine(5 35 10 30 8) + SymbolLine(5 35 5 45 8) + SymbolLine(0 50 5 45 8) +) +Symbol('~' 12) +( + SymbolLine(0 35 5 30 8) + SymbolLine(5 30 10 30 8) + SymbolLine(10 30 15 35 8) + SymbolLine(15 35 20 35 8) + SymbolLine(20 35 25 30 8) +) +Via[48000 28000 8000 4000 0 3000 "" ""] +Via[63000 86000 8000 4000 0 3000 "" ""] + +Element["" "DIP18" "U5" "16F84" 116500 28500 17000 5000 3 100 ""] +( + Pin[0 0 8000 3000 5600 2800 "1" "1" "square"] + Pin[0 10000 8000 3000 5600 2800 "2" "2" ""] + Pin[0 20000 8000 3000 5600 2800 "3" "3" ""] + Pin[0 30000 8000 3000 5600 2800 "4" "4" ""] + Pin[0 40000 8000 3000 5600 2800 "5" "5" ""] + Pin[0 50000 8000 3000 5600 2800 "6" "6" ""] + Pin[0 60000 8000 3000 5600 2800 "7" "7" ""] + Pin[0 70000 8000 3000 5600 2800 "8" "8" ""] + Pin[0 80000 8000 3000 5600 2800 "9" "9" ""] + Pin[30000 80000 8000 3000 5600 2800 "10" "10" ""] + Pin[30000 70000 8000 3000 5600 2800 "11" "11" ""] + Pin[30000 60000 8000 3000 5600 2800 "12" "12" ""] + Pin[30000 50000 8000 3000 5600 2800 "13" "13" ""] + Pin[30000 40000 8000 3000 5600 2800 "14" "14" ""] + Pin[30000 30000 8000 3000 5600 2800 "15" "15" ""] + Pin[30000 20000 8000 3000 5600 2800 "16" "16" ""] + Pin[30000 10000 8000 3000 5600 2800 "17" "17" ""] + Pin[30000 0 8000 3000 5600 2800 "18" "18" ""] + ElementLine [20000 -5000 35000 -5000 1000] + ElementLine [-5000 -5000 10000 -5000 1000] + ElementLine [35000 85000 35000 -5000 1000] + ElementLine [-5000 85000 35000 85000 1000] + ElementLine [-5000 -5000 -5000 85000 1000] + ElementArc [15000 -5000 5000 5000 0 180 1000] + + ) + +Element["" "TO220" "U6" "unknown" 179500 45000 23000 -15000 0 100 ""] +( + Pin[0 -10000 8000 3000 8600 5000 "1" "1" "square,edge2"] + Pin[0 0 8000 3000 8600 5000 "2" "2" "edge2"] + Pin[0 10000 8000 3000 8600 5000 "3" "3" "edge2"] + Pin[67000 0 17500 3000 15100 13000 "4" "4" "edge2"] + ElementLine [0 -10000 18000 -10000 3000] + ElementLine [0 0 18000 0 3000] + ElementLine [0 10000 18000 10000 3000] + ElementLine [18000 -20000 18000 20000 2000] + ElementLine [18000 20000 55500 20000 2000] + ElementLine [55500 -20000 55500 20000 2000] + ElementLine [18000 -20000 55500 -20000 2000] + ElementLine [55500 -20000 55500 20000 2000] + ElementLine [55500 20000 68000 20000 2000] + ElementLine [68000 18500 68000 20000 2000] + ElementLine [68000 18500 75000 18500 2000] + ElementLine [75000 18500 75000 20000 2000] + ElementLine [75000 20000 79000 20000 2000] + ElementLine [79000 -20000 79000 20000 2000] + ElementLine [75000 -20000 79000 -20000 2000] + ElementLine [75000 -20000 75000 -18500 2000] + ElementLine [68000 -18500 75000 -18500 2000] + ElementLine [68000 -20000 68000 -18500 2000] + ElementLine [55500 -20000 68000 -20000 2000] + + ) + +Element["" "RCY300" "C11" "unknown" 205500 94500 2500 10000 3 100 ""] +( + Pin[0 0 8000 3000 5600 5000 "1" "1" ""] + Pin[0 30000 8000 3000 5600 5000 "2" "2" "square"] + ElementArc [0 15000 30000 30000 270 360 1000] + + ) + +Element["" "ALF400" "Z5" "unknown" 129000 142500 -33800 900 0 100 ""] +( + Pin[0 0 8000 3000 4600 2000 "2" "2" "square,edge2"] + Pin[-40000 0 8000 3000 4600 2000 "1" "1" "edge2"] + ElementLine [-13300 0 0 0 1000] + ElementLine [-40000 0 -26700 0 1000] + ElementLine [-13300 0 -26700 6600 1000] + ElementLine [-26700 -6600 -26700 6600 1000] + ElementLine [-26700 -6600 -13300 0 1000] + ElementLine [-13300 -6600 -13300 6600 1000] + + ) + +Element["" "ACY400" "R21" "unknown" 82500 28000 -5300 32000 3 100 ""] +( + Pin[0 0 8000 3000 5100 3000 "1" "1" "square"] + Pin[0 40000 8000 3000 5100 3000 "2" "2" ""] + ElementLine [0 0 0 10000 1000] + ElementLine [0 30000 0 40000 1000] + ElementLine [3300 10000 3300 30000 1000] + ElementLine [-3300 30000 3300 30000 1000] + ElementLine [-3300 10000 -3300 30000 1000] + ElementLine [-3300 10000 3300 10000 1000] + + ) + +Element["" "AXIAL_LAY-200" "C13" "100n" 87000 110000 -6000 -11400 0 100 ""] +( + Pin[5000 0 8000 3000 8600 3000 "1" "1" "edge2"] + Pin[-15000 0 8000 3000 8600 3000 "2" "2" "edge2"] + ElementLine [0 -1600 0 1600 1000] + ElementLine [-10000 -1600 0 -1600 1000] + ElementLine [-10000 -1600 -10000 1600 1000] + ElementLine [-10000 1600 0 1600 1000] + ElementLine [-15000 0 -10000 0 1000] + ElementLine [0 0 5000 0 1000] + + ) +Layer(1 "component") +( +) +Layer(2 "solder") +( + Line[48000 28000 48000 30000 4000 4000 "clearline"] + Line[48000 30000 69000 51000 4000 4000 "clearline"] + Line[69000 51000 96000 51000 4000 4000 "clearline"] + Line[96000 51000 98000 53000 4000 4000 "clearline"] + Line[98000 53000 98000 60000 4000 4000 "clearline"] + Line[98000 60000 106000 68000 4000 4000 "clearline"] + Line[106000 68000 116000 68000 4000 4000 "clearline"] + Line[116000 68000 116500 68500 4000 4000 "clearline"] + Line[82500 68000 82500 99500 4000 4000 "clearline"] + Line[82500 99500 72000 110000 4000 4000 "clearline"] + Line[92000 110000 93000 110000 4000 4000 "clearline"] + Line[93000 110000 101000 102000 4000 4000 "clearline"] + Line[101000 102000 101000 81000 4000 4000 "clearline"] + Line[101000 81000 103000 79000 4000 4000 "clearline"] + Line[103000 79000 116000 79000 4000 4000 "clearline"] + Line[116000 79000 116500 78500 4000 4000 "clearline"] + Line[116500 48500 129500 48500 4000 4000 "clearline"] + Line[129500 48500 133000 52000 4000 4000 "clearline"] + Line[133000 52000 133000 64000 4000 4000 "clearline"] + Line[133000 64000 137000 68000 4000 4000 "clearline"] + Line[137000 68000 146000 68000 4000 4000 "clearline"] + Line[146000 68000 146500 68500 4000 4000 "clearline"] + Line[146500 88500 137500 88500 4000 4000 "clearline"] + Line[137500 88500 129000 97000 4000 4000 "clearline"] + Line[129000 97000 118000 97000 4000 4000 "clearline"] + Line[118000 97000 116500 98500 4000 4000 "clearline"] + Line[129000 142500 131500 142500 4000 4000 "clearline"] + Line[131500 142500 161000 113000 4000 4000 "clearline"] + Line[161000 113000 161000 63000 4000 4000 "clearline"] + Line[161000 63000 158000 60000 4000 4000 "clearline"] + Line[158000 60000 148000 60000 4000 4000 "clearline"] + Line[148000 60000 146500 58500 4000 4000 "clearline"] + Line[205500 94500 205500 44500 4000 4000 "clearline"] + Line[205500 44500 197000 36000 4000 4000 "clearline"] + Line[197000 36000 180500 36000 4000 4000 "clearline"] + Line[180500 36000 179500 35000 4000 4000 "clearline"] + Line[82500 28000 96500 14000 4000 4000 "clearline"] + Line[96500 14000 128000 14000 4000 4000 "clearline"] + Line[128000 14000 133000 19000 4000 4000 "clearline"] + Line[133000 19000 133000 35000 4000 4000 "clearline"] + Line[133000 35000 136500 38500 4000 4000 "clearline"] + Line[136500 38500 146500 38500 4000 4000 "clearline"] + Line[146500 28500 148000 27000 4000 4000 "clearline"] + Line[148000 27000 166000 27000 4000 4000 "clearline"] + Line[166000 27000 166000 42000 4000 4000 "clearline"] + Line[166000 42000 169000 45000 4000 4000 "clearline"] + Line[169000 45000 179500 45000 4000 4000 "clearline"] + Line[179500 55000 179500 98500 4000 4000 "clearline"] + Line[179500 98500 205500 124500 4000 4000 "clearline"] + Line[89000 142500 107500 124000 4000 4000 "clearline"] + Line[107500 124000 127000 124000 4000 4000 "clearline"] + Line[127000 124000 127000 110000 4000 4000 "clearline"] + Line[127000 110000 138500 98500 4000 4000 "clearline"] + Line[138500 98500 146500 98500 4000 4000 "clearline"] + Line[146500 78500 132500 78500 4000 4000 "clearline"] + Line[132500 78500 132000 78000 4000 4000 "clearline"] + Line[132000 78000 121500 88500 4000 4000 "clearline"] + Line[121500 88500 116500 88500 4000 4000 "clearline"] + Line[63000 86000 63000 72000 4000 4000 "clearline"] + Line[63000 72000 67000 68000 4000 4000 "clearline"] + Line[67000 68000 82500 68000 4000 4000 "clearline"] + Polygon("clearpoly") + ( + [257000 147000] [169000 147000] [169000 10000] [257000 10000] + ) +) +Layer(3 "GND") +( +) +Layer(4 "power") +( +) +Layer(5 "signal1") +( +) +Layer(6 "signal2") +( +) +Layer(7 "signal3") +( +) +Layer(8 "signal4") +( +) +Layer(9 "silk") +( +) +Layer(10 "silk") +( +) Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/gcode.pdf and /tmp/7VS3dXhxjw/pcb-20110918/doc/gcode.pdf differ Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/gcode.png and /tmp/7VS3dXhxjw/pcb-20110918/doc/gcode.png differ diff -Nru pcb-20100929/doc/gcode_tool_path.eps pcb-20110918/doc/gcode_tool_path.eps --- pcb-20100929/doc/gcode_tool_path.eps 1970-01-01 00:00:00.000000000 +0000 +++ pcb-20110918/doc/gcode_tool_path.eps 2011-06-05 21:25:44.000000000 +0000 @@ -0,0 +1,415 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: cairo 1.8.10 (http://cairographics.org) +%%CreationDate: Mon May 30 02:27:10 2011 +%%Pages: 1 +%%BoundingBox: 0 0 403 230 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%EndComments +%%BeginProlog +/cairo_eps_state save def +/dict_count countdictstack def +/op_count count 1 sub def +userdict begin +/q { gsave } bind def +/Q { grestore } bind def +/cm { 6 array astore concat } bind def +/w { setlinewidth } bind def +/J { setlinecap } bind def +/j { setlinejoin } bind def +/M { setmiterlimit } bind def +/d { setdash } bind def +/m { moveto } bind def +/l { lineto } bind def +/c { curveto } bind def +/h { closepath } bind def +/re { exch dup neg 3 1 roll 5 3 roll moveto 0 rlineto + 0 exch rlineto 0 rlineto closepath } bind def +/S { stroke } bind def +/f { fill } bind def +/f* { eofill } bind def +/B { fill stroke } bind def +/B* { eofill stroke } bind def +/n { newpath } bind def +/W { clip } bind def +/W* { eoclip } bind def +/BT { } bind def +/ET { } bind def +/pdfmark where { pop globaldict /?pdfmark /exec load put } + { globaldict begin /?pdfmark /pop load def /pdfmark + /cleartomark load def end } ifelse +/BDC { mark 3 1 roll /BDC pdfmark } bind def +/EMC { mark /EMC pdfmark } bind def +/cairo_store_point { /cairo_point_y exch def /cairo_point_x exch def } def +/Tj { show currentpoint cairo_store_point } bind def +/TJ { + { + dup + type /stringtype eq + { show } { -0.001 mul 0 cairo_font_matrix dtransform rmoveto } ifelse + } forall + currentpoint cairo_store_point +} bind def +/cairo_selectfont { cairo_font_matrix aload pop pop pop 0 0 6 array astore + cairo_font exch selectfont cairo_point_x cairo_point_y moveto } bind def +/Tf { pop /cairo_font exch def /cairo_font_matrix where + { pop cairo_selectfont } if } bind def +/Td { matrix translate cairo_font_matrix matrix concatmatrix dup + /cairo_font_matrix exch def dup 4 get exch 5 get cairo_store_point + /cairo_font where { pop cairo_selectfont } if } bind def +/Tm { 2 copy 8 2 roll 6 array astore /cairo_font_matrix exch def + cairo_store_point /cairo_font where { pop cairo_selectfont } if } bind def +/g { setgray } bind def +/rg { setrgbcolor } bind def +/d1 { setcachedevice } bind def +%%EndProlog +%%Page: 1 1 +%%BeginPageSetup +%%PageBoundingBox: 0 0 403 230 +%%EndPageSetup +q +1 g +0 0 403 230 rectfill +1 0 0 rg +0.5 w +0 J +0 j +[] 0.0 d +10 M q 1 0 0 1 0 230 cm +0 -230.398 m 32.879 -14.398 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +32.879 -14.398 m 32.879 -211.922 l 159.84 -211.922 l 159.84 -70.559 l +150.238 -70.559 l 148.32 -71.762 l 148.32 -72.238 l 150.238 -73.441 l +152.16 -76.32 l 152.641 -79.441 l 152.16 -81.84 l 150.961 -84 l 150.238 +-84.48 l 150.238 -142.801 l 149.762 -144.238 l 149.039 -145.922 l +114.961 -179.281 l 114.961 -186.238 l 114 -186.961 l 100.559 -186.961 l +99.602 -186 l 99.602 -172.559 l 100.559 -171.359 l 107.52 -171.359 l +138.961 -139.441 l 138.961 -84.48 l 138 -83.281 l 137.281 -81.84 l +136.801 -79.199 l 137.281 -76.559 l 138.238 -74.641 l 139.922 -72.961 l +141.121 -72 l 139.922 -71.039 l 138.238 -69.359 l 137.281 -67.441 l +136.801 -64.801 l 137.281 -62.16 l 138.238 -60.238 l 140.398 -58.078 l +137.762 -58.078 l 137.52 -57.602 l 121.922 -57.602 l 112.801 -66.238 l +112.801 -130.801 l 113.52 -131.281 l 114.719 -133.441 l 115.199 +-136.078 l 114.719 -138.961 l 112.801 -141.84 l 110.641 -143.281 l +109.441 -143.762 l 106.801 -144 l 104.16 -143.52 l 101.52 -141.602 l +100.078 -139.441 l 99.602 -137.52 l 99.602 -134.641 l 100.078 -132.719 +l 101.52 -130.801 l 101.52 -63.84 l 102.48 -60.719 l 116.16 -47.281 l +118.078 -46.32 l 137.039 -46.078 l 137.039 -43.441 l 138.238 -42.48 l +151.441 -42.48 l 152.398 -43.68 l 152.398 -57.359 l 151.441 -58.078 l +149.281 -58.078 l 149.281 -58.559 l 149.762 -59.039 l 157.68 -59.039 l +158.398 -58.32 l 158.398 -38.641 l 159.359 -35.52 l 159.84 -35.281 l +159.84 -14.398 l 32.879 -14.398 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +32.879 -14.398 m 46.078 -50.16 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +46.078 -50.16 m 43.441 -50.879 l 41.281 -51.84 l 38.16 -54 l 36 -56.641 +l 34.32 -60 l 33.602 -64.801 l 34.32 -69.602 l 36 -72.961 l 38.16 +-75.602 l 41.281 -77.762 l 43.441 -78.719 l 46.32 -79.441 l 50.16 +-79.441 l 53.039 -78.719 l 55.68 -77.52 l 58.559 -75.359 l 60.238 +-73.199 l 62.16 -69.602 l 62.879 -65.281 l 62.641 -62.641 l 62.16 -60 l +60.238 -56.398 l 58.559 -54.238 l 55.68 -52.078 l 53.039 -50.879 l +50.16 -50.16 l 46.078 -50.16 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +46.078 -50.16 m 217.922 -16.801 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +217.922 -16.801 m 217.199 -17.281 l 208.801 -25.441 l 208.078 -26.879 l +208.078 -49.199 l 205.441 -52.078 l 197.281 -52.078 l 195.84 -50.398 l +193.922 -49.441 l 190.32 -49.441 l 188.398 -50.398 l 186.719 -52.32 l +186 -53.762 l 186 -57.359 l 186.719 -58.801 l 188.398 -60.719 l 190.32 +-61.68 l 193.922 -61.68 l 195.84 -60.719 l 197.281 -59.039 l 207.121 +-59.039 l 208.559 -58.32 l 214.559 -52.078 l 215.039 -51.121 l 215.039 +-28.801 l 219.84 -23.762 l 263.039 -23.762 l 277.922 -38.879 l 277.922 +-46.801 l 290.879 -46.801 l 290.879 -33.84 l 282.238 -33.84 l 266.16 +-17.52 l 264.719 -16.801 l 217.922 -16.801 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +217.922 -16.801 m 332.879 -34.078 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +332.879 -34.078 m 331.68 -34.559 l 330.238 -35.281 l 328.559 -37.199 l +327.84 -38.641 l 327.84 -42 l 328.559 -43.922 l 302.641 -70.078 l +264.238 -70.078 l 263.281 -70.559 l 259.199 -74.398 l 258.48 -75.84 l +258.48 -85.441 l 249.121 -94.559 l 239.762 -94.559 l 239.039 -93.602 l +237.121 -92.641 l 233.52 -92.641 l 231.602 -93.602 l 229.922 -95.52 l +229.199 -96.961 l 229.199 -100.559 l 229.922 -102 l 231.602 -103.922 l +233.52 -104.879 l 237.121 -104.879 l 239.039 -103.922 l 241.199 -101.52 +l 251.039 -101.52 l 252 -101.039 l 264.719 -88.559 l 265.441 -87.121 l +265.441 -77.52 l 265.922 -77.039 l 304.32 -77.039 l 305.762 -76.32 l +335.039 -46.801 l 337.199 -45.84 l 339.121 -44.16 l 340.078 -42.238 l +340.078 -38.641 l 339.359 -37.199 l 337.68 -35.281 l 335.762 -34.32 l +332.879 -34.078 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +332.879 -34.078 m 228.961 -34.559 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +228.961 -34.559 m 228.961 -47.52 l 241.922 -47.52 l 241.922 -34.559 l +228.961 -34.559 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +228.961 -34.559 m 191.039 -34.801 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +191.039 -34.801 m 189.359 -35.52 l 163.199 -35.52 l 161.762 -36.719 l +160.559 -38.16 l 160.559 -59.52 l 158.398 -61.441 l 149.762 -61.441 l +148.32 -59.762 l 146.398 -58.801 l 142.801 -58.801 l 141.359 -59.52 l +139.441 -61.199 l 138.48 -63.121 l 138.48 -66.719 l 139.441 -68.641 l +141.359 -70.32 l 142.801 -71.039 l 146.398 -71.039 l 148.32 -70.078 l +149.762 -68.398 l 160.32 -68.398 l 161.281 -67.922 l 166.801 -62.641 l +167.52 -61.199 l 167.52 -42.48 l 186 -42.48 l 186.48 -44.16 l 188.398 +-46.32 l 190.32 -47.281 l 193.922 -47.281 l 195.84 -46.32 l 197.52 +-44.398 l 198.238 -42.961 l 198.238 -39.359 l 197.52 -37.922 l 195.84 +-36 l 193.922 -35.039 l 191.039 -34.801 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +191.039 -34.801 m 138.238 -43.922 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +138.238 -43.922 m 138.238 -48.48 l 118.801 -48.48 l 117.84 -48.961 l +104.398 -62.16 l 103.68 -63.602 l 103.68 -131.039 l 102 -132.48 l +101.039 -134.398 l 101.039 -138 l 101.762 -139.441 l 103.441 -141.359 l +105.359 -142.32 l 108.961 -142.32 l 110.879 -141.359 l 112.559 -139.441 +l 113.281 -138 l 113.281 -134.398 l 112.32 -132.48 l 110.641 -131.039 l +110.641 -65.52 l 120.48 -55.441 l 138.238 -55.441 l 138.238 -56.879 l +151.199 -56.879 l 151.199 -43.922 l 138.238 -43.922 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +138.238 -43.922 m 234.238 -49.199 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +234.238 -49.199 m 233.039 -49.68 l 231.602 -50.398 l 229.922 -52.32 l +229.199 -53.762 l 229.199 -57.359 l 230.16 -59.281 l 232.078 -60.961 l +233.52 -61.68 l 237.121 -61.68 l 239.039 -60.719 l 240.719 -58.801 l +241.441 -57.359 l 241.441 -53.762 l 240.719 -52.32 l 239.039 -50.398 l +237.121 -49.441 l 234.238 -49.199 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +234.238 -49.199 m 191.039 -63.602 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +191.039 -63.602 m 189.84 -64.078 l 188.398 -64.801 l 186.719 -66.719 l +186 -68.16 l 186 -71.762 l 186.961 -73.68 l 188.879 -75.359 l 190.32 +-76.078 l 193.922 -76.078 l 195.84 -75.121 l 197.52 -73.199 l 198.238 +-71.762 l 198.238 -68.16 l 197.52 -66.719 l 195.84 -64.801 l 193.922 +-63.84 l 191.039 -63.602 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +191.039 -63.602 m 234.238 -63.602 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +234.238 -63.602 m 233.039 -64.078 l 231.602 -64.801 l 230.16 -66.48 l +216 -66.48 l 215.039 -66.961 l 208.801 -72.961 l 208.078 -74.398 l +208.078 -90.961 l 204.719 -94.559 l 196.559 -94.559 l 195.84 -93.602 l +193.922 -92.641 l 190.32 -92.641 l 188.879 -93.359 l 186.961 -95.039 l +186 -96.961 l 186 -100.559 l 186.961 -102.48 l 188.879 -104.16 l 190.32 +-104.879 l 193.922 -104.879 l 195.84 -103.922 l 198 -101.52 l 206.398 +-101.52 l 207.84 -100.801 l 214.559 -93.84 l 215.039 -92.879 l 215.039 +-76.078 l 217.922 -73.441 l 230.16 -73.441 l 231.602 -75.121 l 233.52 +-76.078 l 237.121 -76.078 l 239.039 -75.121 l 240.719 -73.199 l 241.441 +-71.762 l 241.441 -68.16 l 240.719 -66.719 l 239.039 -64.801 l 237.121 +-63.84 l 234.238 -63.602 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +234.238 -63.602 m 143.52 -72.961 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +143.52 -72.961 m 142.32 -73.441 l 140.879 -74.16 l 139.199 -76.078 l +138.48 -77.52 l 138.48 -81.121 l 139.441 -83.039 l 141.121 -84.48 l +141.121 -140.879 l 108.961 -172.801 l 100.801 -172.801 l 100.801 +-185.762 l 113.762 -185.762 l 113.762 -177.359 l 147.359 -144 l 148.078 +-142.559 l 148.078 -84.48 l 149.762 -83.039 l 150.719 -81.121 l 150.719 +-77.52 l 150 -76.078 l 148.32 -74.16 l 146.398 -73.199 l 143.52 -72.961 +l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +143.52 -72.961 m 191.039 -78 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +191.039 -78 m 189.84 -78.48 l 188.398 -79.199 l 186.48 -81.359 l 186 +-83.039 l 174.961 -83.039 l 174 -83.52 l 168.48 -88.801 l 167.762 +-90.238 l 167.762 -163.441 l 168.48 -164.879 l 210.961 -207.121 l +210.961 -211.68 l 223.922 -211.68 l 223.922 -198.719 l 211.68 -198.719 +l 174.719 -161.52 l 174.719 -92.16 l 176.641 -90 l 189.359 -90 l +191.281 -90.719 l 193.922 -90.48 l 195.84 -89.52 l 197.52 -87.602 l +198.238 -86.16 l 198.238 -82.559 l 197.52 -81.121 l 195.84 -79.199 l +193.922 -78.238 l 191.039 -78 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +191.039 -78 m 234.238 -78 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +234.238 -78 m 233.039 -78.48 l 231.602 -79.199 l 229.922 -81.121 l +229.199 -82.559 l 229.199 -86.16 l 230.16 -88.078 l 232.078 -89.762 l +233.52 -90.48 l 237.121 -90.48 l 239.039 -89.52 l 240.719 -87.602 l +241.441 -86.16 l 241.441 -82.559 l 240.719 -81.121 l 239.039 -79.199 l +237.121 -78.238 l 234.238 -78 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +234.238 -78 m 283.199 -91.68 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +283.199 -91.68 m 282 -92.16 l 280.559 -92.879 l 278.879 -94.801 l +278.16 -96.238 l 278.16 -99.84 l 279.121 -101.762 l 280.801 -103.199 l +280.801 -144 l 281.281 -144.961 l 293.039 -156.961 l 293.281 -160.32 l +294.238 -162.238 l 296.16 -163.922 l 297.602 -164.641 l 301.199 +-164.641 l 303.121 -163.68 l 304.801 -161.762 l 305.52 -160.32 l 305.52 +-156.719 l 304.801 -155.281 l 303.121 -153.359 l 301.199 -152.398 l +297.84 -152.16 l 287.762 -142.32 l 287.762 -103.199 l 289.68 -101.52 l +305.52 -101.52 l 308.879 -105.121 l 308.879 -118.801 l 307.199 -120.238 +l 306.238 -122.16 l 306.238 -125.762 l 306.961 -127.199 l 308.641 +-129.121 l 310.559 -130.078 l 314.16 -130.078 l 316.078 -129.121 l +317.762 -127.199 l 318.48 -125.762 l 318.48 -122.16 l 317.52 -120.238 l +315.84 -118.801 l 315.84 -103.199 l 315.121 -101.762 l 308.16 -95.039 l +307.199 -94.559 l 289.441 -94.559 l 288 -92.879 l 286.078 -91.922 l +283.199 -91.68 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +283.199 -91.68 m 191.039 -106.801 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +191.039 -106.801 m 189.84 -107.281 l 188.398 -108 l 186.719 -109.922 l +186 -111.359 l 186 -114.961 l 186.961 -116.879 l 188.879 -118.559 l +190.32 -119.281 l 193.922 -119.281 l 195.84 -118.32 l 197.281 -116.641 +l 212.641 -116.641 l 226.078 -130.32 l 227.52 -131.039 l 230.16 +-131.039 l 231.602 -132.719 l 233.52 -133.68 l 237.121 -133.68 l +238.559 -132.961 l 240.48 -131.281 l 241.441 -129.359 l 241.441 +-125.762 l 240.48 -123.84 l 238.559 -122.16 l 237.121 -121.441 l 233.52 +-121.441 l 231.602 -122.398 l 230.16 -124.078 l 229.199 -124.078 l +215.039 -109.68 l 213.602 -108.961 l 212.16 -108.961 l 211.199 -109.68 +l 197.281 -109.68 l 195.84 -108 l 193.922 -107.039 l 191.039 -106.801 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +191.039 -106.801 m 234.238 -106.801 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +234.238 -106.801 m 233.039 -107.281 l 231.602 -108 l 229.922 -109.922 l +229.199 -111.359 l 229.199 -114.961 l 230.16 -116.879 l 232.078 +-118.559 l 233.52 -119.281 l 237.121 -119.281 l 239.039 -118.32 l +239.762 -117.359 l 253.68 -117.359 l 254.16 -117.84 l 254.16 -147.602 l +254.641 -148.559 l 264.238 -158.398 l 264.48 -160.32 l 265.199 -161.762 +l 266.879 -163.68 l 268.801 -164.641 l 272.398 -164.641 l 274.32 +-163.68 l 276 -161.762 l 276.719 -160.32 l 276.719 -156.719 l 276 +-155.281 l 274.32 -153.359 l 272.398 -152.398 l 270.238 -152.16 l +268.078 -152.641 l 261.121 -145.922 l 261.121 -116.16 l 260.398 +-114.719 l 256.32 -110.879 l 255.359 -110.398 l 241.199 -110.398 l +239.039 -108 l 237.121 -107.039 l 234.238 -106.801 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +234.238 -106.801 m 191.039 -121.199 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +191.039 -121.199 m 189.84 -121.68 l 188.398 -122.398 l 186.719 -124.32 +l 186 -125.762 l 186 -129.359 l 186.961 -131.281 l 188.879 -132.961 l +190.32 -133.68 l 193.922 -133.68 l 195.84 -132.719 l 197.281 -131.039 l +204 -131.039 l 215.281 -142.559 l 216.719 -143.281 l 229.199 -143.281 l +229.68 -144.961 l 231.602 -147.121 l 233.52 -148.078 l 237.121 -148.078 +l 238.559 -147.359 l 240.48 -145.68 l 241.441 -143.762 l 241.441 +-140.16 l 240.48 -138.238 l 238.559 -136.559 l 237.121 -135.84 l 234.48 +-135.602 l 232.559 -136.32 l 218.398 -136.32 l 207.121 -124.801 l +205.68 -124.078 l 197.281 -124.078 l 195.84 -122.398 l 193.922 -121.441 +l 191.039 -121.199 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +191.039 -121.199 m 191.039 -135.602 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +191.039 -135.602 m 189.84 -136.078 l 188.398 -136.801 l 186.719 +-138.719 l 186 -140.16 l 186 -143.762 l 186.961 -145.68 l 188.879 +-147.359 l 190.32 -148.078 l 193.922 -148.078 l 195.84 -147.121 l +197.281 -145.441 l 202.32 -145.441 l 216.719 -159.602 l 216.719 -179.52 +l 217.922 -180.961 l 219.359 -182.16 l 247.199 -182.16 l 268.559 +-203.762 l 268.801 -207.121 l 269.52 -208.559 l 271.199 -210.48 l +273.121 -211.441 l 276.719 -211.441 l 278.641 -210.48 l 280.32 -208.559 +l 281.039 -207.121 l 281.039 -203.52 l 280.32 -202.078 l 278.641 +-200.16 l 276.719 -199.199 l 273.359 -198.961 l 249.84 -175.68 l +248.879 -175.199 l 223.68 -175.199 l 223.68 -157.922 l 223.199 -156.961 +l 205.68 -139.199 l 204.238 -138.48 l 197.281 -138.48 l 195.84 -136.801 +l 193.922 -135.84 l 191.039 -135.602 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +191.039 -135.602 m 191.039 -150 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +191.039 -150 m 189.84 -150.48 l 188.398 -151.199 l 186.719 -153.121 l +186 -154.559 l 186 -158.16 l 186.961 -160.078 l 188.879 -161.762 l +190.32 -162.48 l 193.922 -162.48 l 195.84 -161.52 l 197.52 -159.602 l +198.238 -158.16 l 198.238 -154.559 l 197.52 -153.121 l 195.84 -151.199 +l 193.922 -150.238 l 191.039 -150 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +191.039 -150 m 234.238 -150 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +234.238 -150 m 233.039 -150.48 l 231.602 -151.199 l 229.922 -153.121 l +229.199 -154.559 l 229.199 -158.16 l 230.16 -160.078 l 232.078 -161.762 +l 233.52 -162.48 l 237.121 -162.48 l 239.039 -161.52 l 240.719 -159.602 +l 241.441 -158.16 l 241.441 -154.559 l 240.719 -153.121 l 239.039 +-151.199 l 237.121 -150.238 l 234.238 -150 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +234.238 -150 m 46.559 -51.84 l S Q +0 g +0.5 w +q 1 0 0 1 0 230 cm +46.559 -51.84 m 44.641 -52.32 l 42.238 -53.281 l 39.602 -54.961 l +37.441 -57.359 l 36 -60 l 35.281 -62.398 l 35.281 -67.441 l 36 -69.84 l +37.441 -72.48 l 39.602 -74.879 l 42.238 -76.559 l 45.359 -77.762 l +50.879 -77.762 l 54 -76.559 l 56.641 -74.879 l 58.801 -72.48 l 60.238 +-69.84 l 60.961 -67.441 l 60.961 -62.398 l 60.238 -60 l 58.801 -57.359 +l 56.641 -54.961 l 54 -53.281 l 50.879 -52.078 l 46.559 -51.84 l S Q +1 0 0 rg +0.5 w +q 1 0 0 1 0 230 cm +46.559 -51.84 m S Q +Q +showpage +%%Trailer +count op_count sub {pop} repeat +countdictstack dict_count sub {end} repeat +cairo_eps_state restore +%%EOF Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/gcode_tool_path.pdf and /tmp/7VS3dXhxjw/pcb-20110918/doc/gcode_tool_path.pdf differ Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/gcode_tool_path.png and /tmp/7VS3dXhxjw/pcb-20110918/doc/gcode_tool_path.png differ diff -Nru pcb-20100929/doc/Makefile.am pcb-20110918/doc/Makefile.am --- pcb-20100929/doc/Makefile.am 2009-11-01 05:22:30.000000000 +0000 +++ pcb-20110918/doc/Makefile.am 2011-09-18 19:55:12.000000000 +0000 @@ -36,30 +36,20 @@ # via GIT are considered to be doing "development" and incur a slightly # higher list of required tools. if GIT_OR_CVS_VERSION -pcb_TEXINFOS= ${inline_texi} ${pcb_output} ${tab_texi} +pcb_TEXINFOS= ${inline_texi} ${pcb_output} ${tab_texi} ${images_output} else pcb_TEXINFOS= endif -dist_html_DATA= ${html_docs} ${pcb_output_inst} -dist_ps_DATA= ${ps_docs} +dist_html_DATA= ${html_docs} ${pcb_output_inst} ${images_output_inst} dist_pdf_DATA= ${pdf_docs} dist_man_MANS= pcb.1 html_docs= ${info_TEXINFOS:.texi=.html} -ps_docs= ${info_TEXINFOS:.texi=.ps} refcard.ps pdf_docs= ${info_TEXINFOS:.texi=.pdf} refcard.pdf -# these dependencies prevent a parallel make job -# from trying to invoke latex and pdflatex at the same -# time on the same input file. That causes clashes in -# the .aux files which are used by both latex and -# pdflatex. -if GIT_OR_CVS_VERSION -refcard.pdf: refcard.ps -pcb.pdf: pcb.ps -endif +DVIS= # put the html manual into 1 file instead of multiple files? AM_MAKEINFOHTMLFLAGS= --css-include=$(srcdir)/pcb.css --no-split @@ -75,25 +65,26 @@ eps2png \ extract-docs \ refcard.tex \ - pcb.dvi \ pcb.css \ - refcard.dvi \ ${inline_texi} \ ${pcb_files} \ ${pcb_output_noinst} \ ${tab_files} \ - ${tab_texi} + ${tab_texi} \ + ${images} if GIT_OR_CVS_VERSION BUILT_SOURCES= ${tab_texi} ${pcb_output} ${inline_texi} CLEANFILES= \ - refcard.aux refcard.dvi refcard.log refcard.pdf refcard.ps \ - ${pcb_output} ${tab_texi} ${inline_texi} pcb.dvi pcb.html pcb.pdf pcb.ps + refcard.aux refcard.log refcard.pdf \ + ${pcb_output} ${tab_texi} ${inline_texi} pcb.html pcb.pdf \ + ${images_output} else BUILT_SOURCES= endif inline_texi= \ + options.texi \ actions.texi \ pcbfile.texi @@ -111,18 +102,30 @@ pcb_files= \ pad.pcb \ puller.pcb \ - thermal.pcb + thermal.pcb \ + gcode.pcb pcb_output_noinst= \ - ${pcb_files:.pcb=.eps} \ ${pcb_files:.pcb=.pdf} pcb_output_inst= \ - ${pcb_files:.pcb=.gif} \ ${pcb_files:.pcb=.png} pcb_output= ${pcb_output_inst} ${pcb_output_noinst} +# Additional images +images= \ + gcode_control_img.eps \ + gcode_tool_path.eps + +images_output_noinst= \ + ${images:.eps=.pdf} + +images_output_inst= \ + ${images:.eps=.png} + +images_output= ${images_output_noinst} ${images_output_inst} + ${inline_texi} : extracted-docs # no need to build these when building via a tarball. They're not used then @@ -135,14 +138,11 @@ @echo "Skipping documentation extraction since you are not building from GIT sources" endif -SUFFIXES = .dvi .eps .gif .pcb .pdf .png .ps .tab .tex +SUFFIXES = .eps .pcb .pdf .png .tab .tex .pcb.eps : ${PCB} -x eps --only-visible --font-path $(top_srcdir)/src --eps-file $@ $< -.pcb.gif : - ${PCB} -x png --only-visible --format GIF --font-path $(top_srcdir)/src --outfile $@ $< - .pcb.png : ${PCB} -x png --only-visible --font-path $(top_srcdir)/src --outfile $@ $< @@ -159,28 +159,6 @@ .tab.texi: ${ASCII2TEXI} $< > $@ -.tex.dvi: -if MISSING_LATEX - @echo "****************************************************" - @echo "WARNING: LaTeX is missing on your system but" - @echo "$@ is out of date and needs to rebuilt." - @echo "Changes to $< will be ignored" -else - ${LATEX} $< - ${LATEX} $< - ${LATEX} $< -endif - -.dvi.ps: -if MISSING_DVIPS - @echo "****************************************************" - @echo "WARNING: dvips is missing on your system but" - @echo "$@ is out of date and needs to rebuilt." - @echo "Changes to $< will be ignored" -else - ${DVIPS} -Ppdf -j0 -D 300 -o $@ $< -endif - .tex.pdf: if MISSING_PDFLATEX @echo "****************************************************" @@ -192,3 +170,6 @@ ${PDFLATEX} $< ${PDFLATEX} $< endif + +.eps.png: + ${PERL} $(srcdir)/eps2png --png $< > $@ diff -Nru pcb-20100929/doc/Makefile.in pcb-20110918/doc/Makefile.in --- pcb-20100929/doc/Makefile.in 2010-09-29 20:52:39.000000000 +0000 +++ pcb-20110918/doc/Makefile.in 2011-09-18 20:06:19.000000000 +0000 @@ -36,11 +36,29 @@ host_triplet = @host@ subdir = doc DIST_COMMON = $(dist_html_DATA) $(dist_man_MANS) $(dist_pdf_DATA) \ - $(dist_ps_DATA) $(pcb_TEXINFOS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/stamp-vti \ - $(srcdir)/version.texi mdate-sh texinfo.tex + $(pcb_TEXINFOS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/stamp-vti $(srcdir)/version.texi mdate-sh \ + texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ + $(top_srcdir)/m4/ax_check_glu.m4 \ + $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ + $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ + $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/signed.m4 \ + $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/m4_ax_func_mkdir.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -52,16 +70,15 @@ DIST_SOURCES = INFO_DEPS = $(srcdir)/pcb.info am__TEXINFO_TEX_DIR = $(srcdir) -DVIS = pcb.dvi PDFS = pcb.pdf PSS = pcb.ps HTMLS = pcb.html TEXINFOS = pcb.texi TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html +DVIPS = dvips am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pdfdir)" \ - "$(DESTDIR)$(psdir)" + "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pdfdir)" am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -86,7 +103,7 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man_MANS) -DATA = $(dist_html_DATA) $(dist_pdf_DATA) $(dist_ps_DATA) +DATA = $(dist_html_DATA) $(dist_pdf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -103,11 +120,15 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ +CC_OR_CXX = @CC_OR_CXX@ +CC_OR_CXX_FLAGS = @CC_OR_CXX_FLAGS@ CFLAGS = @CFLAGS@ -CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CONVERT = @CONVERT@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -115,7 +136,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DOC = @DOC@ -DVIPS = @DVIPS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -125,24 +145,26 @@ GDLIB_CONFIG = @GDLIB_CONFIG@ GENCAT = @GENCAT@ GERBV = @GERBV@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ +GLU_CFLAGS = @GLU_CFLAGS@ +GLU_LIBS = @GLU_LIBS@ +GL_CFLAGS = @GL_CFLAGS@ +GL_LIBS = @GL_LIBS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GNUM4 = @GNUM4@ GREP = @GREP@ GSCHEM = @GSCHEM@ +GTKGLEXT_CFLAGS = @GTKGLEXT_CFLAGS@ +GTKGLEXT_LIBS = @GTKGLEXT_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTK_UPDATE_ICON_CACHE_BIN = @GTK_UPDATE_ICON_CACHE_BIN@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ HAVE_SNPRINTF = @HAVE_SNPRINTF@ -HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WPRINTF = @HAVE_WPRINTF@ HIDLIBS = @HIDLIBS@ HIDLIST = @HIDLIST@ @@ -166,10 +188,8 @@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ KDEDATADIR = @KDEDATADIR@ KPSEWHICH = @KPSEWHICH@ -LATEX = @LATEX@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -177,27 +197,19 @@ LEX_PATH = @LEX_PATH@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ LIBRARYFILENAME = @LIBRARYFILENAME@ LIBS = @LIBS@ -LIBTHREAD = @LIBTHREAD@ -LTLIBC = @LTLIBC@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ M4 = @M4@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MKINFO = @MKINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -205,6 +217,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PCB = @PCB@ @@ -214,11 +227,16 @@ PDFLATEX = @PDFLATEX@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PPMTOWINICON = @PPMTOWINICON@ -PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PS2PDF = @PS2PDF@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SETENV = @SETENV@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -233,12 +251,8 @@ WIN32 = @WIN32@ WINDRES = @WINDRES@ WISH = @WISH@ -WOE32 = @WOE32@ -WOE32DLL = @WOE32DLL@ XDGDATADIR = @XDGDATADIR@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ XPMTOPPM = @XPMTOPPM@ X_CFLAGS = @X_CFLAGS@ @@ -253,11 +267,13 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -307,14 +323,13 @@ # to build the documentation. Users who obtain the cutting edge sources # via GIT are considered to be doing "development" and incur a slightly # higher list of required tools. -@GIT_OR_CVS_VERSION_TRUE@pcb_TEXINFOS = ${inline_texi} ${pcb_output} ${tab_texi} -dist_html_DATA = ${html_docs} ${pcb_output_inst} -dist_ps_DATA = ${ps_docs} +@GIT_OR_CVS_VERSION_TRUE@pcb_TEXINFOS = ${inline_texi} ${pcb_output} ${tab_texi} ${images_output} +dist_html_DATA = ${html_docs} ${pcb_output_inst} ${images_output_inst} dist_pdf_DATA = ${pdf_docs} dist_man_MANS = pcb.1 html_docs = ${info_TEXINFOS:.texi=.html} -ps_docs = ${info_TEXINFOS:.texi=.ps} refcard.ps pdf_docs = ${info_TEXINFOS:.texi=.pdf} refcard.pdf +DVIS = # put the html manual into 1 file instead of multiple files? AM_MAKEINFOHTMLFLAGS = --css-include=$(srcdir)/pcb.css --no-split @@ -323,22 +338,23 @@ eps2png \ extract-docs \ refcard.tex \ - pcb.dvi \ pcb.css \ - refcard.dvi \ ${inline_texi} \ ${pcb_files} \ ${pcb_output_noinst} \ ${tab_files} \ - ${tab_texi} + ${tab_texi} \ + ${images} @GIT_OR_CVS_VERSION_FALSE@BUILT_SOURCES = @GIT_OR_CVS_VERSION_TRUE@BUILT_SOURCES = ${tab_texi} ${pcb_output} ${inline_texi} @GIT_OR_CVS_VERSION_TRUE@CLEANFILES = \ -@GIT_OR_CVS_VERSION_TRUE@ refcard.aux refcard.dvi refcard.log refcard.pdf refcard.ps \ -@GIT_OR_CVS_VERSION_TRUE@ ${pcb_output} ${tab_texi} ${inline_texi} pcb.dvi pcb.html pcb.pdf pcb.ps +@GIT_OR_CVS_VERSION_TRUE@ refcard.aux refcard.log refcard.pdf \ +@GIT_OR_CVS_VERSION_TRUE@ ${pcb_output} ${tab_texi} ${inline_texi} pcb.html pcb.pdf \ +@GIT_OR_CVS_VERSION_TRUE@ ${images_output} inline_texi = \ + options.texi \ actions.texi \ pcbfile.texi @@ -357,23 +373,35 @@ pcb_files = \ pad.pcb \ puller.pcb \ - thermal.pcb + thermal.pcb \ + gcode.pcb pcb_output_noinst = \ - ${pcb_files:.pcb=.eps} \ ${pcb_files:.pcb=.pdf} pcb_output_inst = \ - ${pcb_files:.pcb=.gif} \ ${pcb_files:.pcb=.png} pcb_output = ${pcb_output_inst} ${pcb_output_noinst} -SUFFIXES = .dvi .eps .gif .pcb .pdf .png .ps .tab .tex + +# Additional images +images = \ + gcode_control_img.eps \ + gcode_tool_path.eps + +images_output_noinst = \ + ${images:.eps=.pdf} + +images_output_inst = \ + ${images:.eps=.png} + +images_output = ${images_output_noinst} ${images_output_inst} +SUFFIXES = .eps .pcb .pdf .png .tab .tex all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .dvi .eps .gif .pcb .pdf .png .ps .tab .tex .html .info .texi +.SUFFIXES: .eps .pcb .pdf .png .tab .tex .dvi .html .info .ps .texi $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -452,7 +480,7 @@ fi $(srcdir)/pcb.info: pcb.texi $(srcdir)/version.texi $(pcb_TEXINFOS) pcb.dvi: pcb.texi $(srcdir)/version.texi $(pcb_TEXINFOS) -@GIT_OR_CVS_VERSION_FALSE@pcb.pdf: pcb.texi $(srcdir)/version.texi $(pcb_TEXINFOS) +pcb.pdf: pcb.texi $(srcdir)/version.texi $(pcb_TEXINFOS) pcb.html: pcb.texi $(srcdir)/version.texi $(pcb_TEXINFOS) $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti $(srcdir)/stamp-vti: pcb.texi $(top_srcdir)/configure @@ -473,6 +501,9 @@ maintainer-clean-vti: @MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi +.dvi.ps: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(DVIPS) -o $@ $< uninstall-dvi-am: @$(NORMAL_UNINSTALL) @@ -640,26 +671,6 @@ test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pdfdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pdfdir)" && rm -f $$files -install-dist_psDATA: $(dist_ps_DATA) - @$(NORMAL_INSTALL) - test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" - @list='$(dist_ps_DATA)'; test -n "$(psdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; \ - done - -uninstall-dist_psDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_ps_DATA)'; test -n "$(psdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(psdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(psdir)" && rm -f $$files tags: TAGS TAGS: @@ -718,7 +729,7 @@ $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(INFO_DEPS) $(MANS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(psdir)"; do \ + for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pdfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -770,7 +781,7 @@ info-am: $(INFO_DEPS) install-data-am: install-dist_htmlDATA install-dist_pdfDATA \ - install-dist_psDATA install-info-am install-man + install-info-am install-man install-dvi: install-dvi-am @@ -892,9 +903,8 @@ ps-am: $(PSS) uninstall-am: uninstall-dist_htmlDATA uninstall-dist_pdfDATA \ - uninstall-dist_psDATA uninstall-dvi-am uninstall-html-am \ - uninstall-info-am uninstall-man uninstall-pdf-am \ - uninstall-ps-am + uninstall-dvi-am uninstall-html-am uninstall-info-am \ + uninstall-man uninstall-pdf-am uninstall-ps-am uninstall-man: uninstall-man1 @@ -904,27 +914,18 @@ dist-info distclean distclean-generic distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dist_htmlDATA install-dist_pdfDATA \ - install-dist_psDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-aminfo maintainer-clean-generic \ - maintainer-clean-vti mostlyclean mostlyclean-aminfo \ - mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dist_htmlDATA \ - uninstall-dist_pdfDATA uninstall-dist_psDATA uninstall-dvi-am \ - uninstall-html-am uninstall-info-am uninstall-man \ - uninstall-man1 uninstall-pdf-am uninstall-ps-am - - -# these dependencies prevent a parallel make job -# from trying to invoke latex and pdflatex at the same -# time on the same input file. That causes clashes in -# the .aux files which are used by both latex and -# pdflatex. -@GIT_OR_CVS_VERSION_TRUE@refcard.pdf: refcard.ps -@GIT_OR_CVS_VERSION_TRUE@pcb.pdf: pcb.ps + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-vti mostlyclean \ + mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-dist_htmlDATA \ + uninstall-dist_pdfDATA uninstall-dvi-am uninstall-html-am \ + uninstall-info-am uninstall-man uninstall-man1 \ + uninstall-pdf-am uninstall-ps-am + # use this to avoid having the clean target delete pcb.{dvi,html,pdf,ps} # which unfortunately deletes files which are part of the distfile @@ -944,9 +945,6 @@ .pcb.eps : ${PCB} -x eps --only-visible --font-path $(top_srcdir)/src --eps-file $@ $< -.pcb.gif : - ${PCB} -x png --only-visible --format GIF --font-path $(top_srcdir)/src --outfile $@ $< - .pcb.png : ${PCB} -x png --only-visible --font-path $(top_srcdir)/src --outfile $@ $< @@ -960,22 +958,6 @@ .tab.texi: ${ASCII2TEXI} $< > $@ -.tex.dvi: -@MISSING_LATEX_TRUE@ @echo "****************************************************" -@MISSING_LATEX_TRUE@ @echo "WARNING: LaTeX is missing on your system but" -@MISSING_LATEX_TRUE@ @echo "$@ is out of date and needs to rebuilt." -@MISSING_LATEX_TRUE@ @echo "Changes to $< will be ignored" -@MISSING_LATEX_FALSE@ ${LATEX} $< -@MISSING_LATEX_FALSE@ ${LATEX} $< -@MISSING_LATEX_FALSE@ ${LATEX} $< - -.dvi.ps: -@MISSING_DVIPS_TRUE@ @echo "****************************************************" -@MISSING_DVIPS_TRUE@ @echo "WARNING: dvips is missing on your system but" -@MISSING_DVIPS_TRUE@ @echo "$@ is out of date and needs to rebuilt." -@MISSING_DVIPS_TRUE@ @echo "Changes to $< will be ignored" -@MISSING_DVIPS_FALSE@ ${DVIPS} -Ppdf -j0 -D 300 -o $@ $< - .tex.pdf: @MISSING_PDFLATEX_TRUE@ @echo "****************************************************" @MISSING_PDFLATEX_TRUE@ @echo "WARNING: pdflatex is missing on your system but" @@ -985,6 +967,9 @@ @MISSING_PDFLATEX_FALSE@ ${PDFLATEX} $< @MISSING_PDFLATEX_FALSE@ ${PDFLATEX} $< +.eps.png: + ${PERL} $(srcdir)/eps2png --png $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru pcb-20100929/doc/options.texi pcb-20110918/doc/options.texi --- pcb-20100929/doc/options.texi 1970-01-01 00:00:00.000000000 +0000 +++ pcb-20110918/doc/options.texi 2011-09-18 20:09:04.000000000 +0000 @@ -0,0 +1,896 @@ +@c key options +@menu +* General Options:: +* General GUI Options:: +* GTK+ GUI Options:: +* lesstif GUI Options:: +* Colors:: +* Layer Names:: +* Paths:: +* Sizes:: +* Commands:: +* DRC Options:: +* BOM Creation:: +* Gerber Export:: +* Postscript Export:: +* Encapsulated Postscript Export:: +* PNG Options:: +* lpr Printing Options:: +* nelma Options:: +@end menu +@c options General Options +@node General Options +@section General Options +@c ./../src/main.c 434 +@ftable @code +@item --help +Show help on command line options. +@end ftable +@c ./../src/main.c 439 +@ftable @code +@item --version +Show version. +@end ftable +@c ./../src/main.c 443 +@ftable @code +@item --verbose +Be verbose on stdout. +@end ftable +@c ./../src/main.c 448 +@ftable @code +@item --copyright +Show copyright. +@end ftable +@c ./../src/main.c 453 +@ftable @code +@item --show-defaults +Show option defaults. +@end ftable +@c ./../src/main.c 458 +@ftable @code +@item --show-actions +Show available actions and exit. +@end ftable +@c ./../src/main.c 463 +@ftable @code +@item --dump-actions +Dump actions (for documentation). +@end ftable +@c ./../src/main.c 468 +@ftable @code +@item --grid-units-mm +Set default grid units. Can be mm or mil. Defaults to mil. +@end ftable +@c ./../src/main.c 686 +@ftable @code +@item --backup-interval +Time between automatic backups in seconds. Set to @code{0} to disable. +The default value is @code{60}. +@end ftable +@c ./../src/main.c 723 +@ftable @code +@item --groups +Layer group string. Defaults to @code{"1,c:2:3:4:5:6,s:7:8"}. +@end ftable +@c ./../src/main.c 788 +@ftable @code +@item --route-styles +A string that defines the route styles. Defaults to @* +@code{"Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000 + :Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"} +@end ftable +@c ./../src/main.c 807 +@ftable @code +@item --element-path +A colon separated list of directories or commands (starts with '|'). +The path is passed to the program specified in @option{--element-command}. +@end ftable +@c ./../src/main.c 817 +@ftable @code +@item --action-script +If set, this file is executed at startup. +@end ftable +@c ./../src/main.c 822 +@ftable @code +@item --action-string +If set, this string of actions is executed at startup. +@end ftable +@c ./../src/main.c 827 +@ftable @code +@item --fab-author +Name of author to be put in the Gerber files. +@end ftable +@c ./../src/main.c 832 +@ftable @code +@item --layer-stack +Initial layer stackup, for setting up an export. A comma separated list of layer +names, layer numbers and layer groups. +@end ftable +@c ./../src/main.c 883 +@ftable @code +@item --save-last-command +If set, the last user command is saved. +@end ftable +@c ./../src/main.c 887 +@ftable @code +@item --save-in-tmp +If set, all data which would otherwise be lost are saved in a temporary file +@file{/tmp/PCB.%i.save} . Sequence @samp{%i} is replaced by the process ID. +@end ftable +@c ./../src/main.c 901 +@ftable @code +@item --reset-after-element +If set, all found connections are reset before a new component is scanned. +@end ftable +@c ./../src/main.c 906 +@ftable @code +@item --ring-bell-finished +Execute the bell command when all rats are routed. +@end ftable +@c options General GUI Options +@node General GUI Options +@section General GUI Options +@c ./../src/main.c 842 +@ftable @code +@item --pinout-offset-x +Horizontal offset of the pin number display. Defaults to @code{100mil}. +@end ftable +@c ./../src/main.c 847 +@ftable @code +@item --pinout-offset-y +Vertical offset of the pin number display. Defaults to @code{100mil}. +@end ftable +@c ./../src/main.c 852 +@ftable @code +@item --pinout-text-offset-x +Horizontal offset of the pin name display. Defaults to @code{800mil}. +@end ftable +@c ./../src/main.c 857 +@ftable @code +@item --pinout-text-offset-y +Vertical offset of the pin name display. Defaults to @code{-100mil}. +@end ftable +@c ./../src/main.c 862 +@ftable @code +@item --draw-grid +If set, draw the grid at start-up. +@end ftable +@c ./../src/main.c 866 +@ftable @code +@item --clear-line +If set, new lines clear polygons. +@end ftable +@c ./../src/main.c 870 +@ftable @code +@item --full-poly +If set, new polygons are full ones. +@end ftable +@c ./../src/main.c 874 +@ftable @code +@item --unique-names +If set, you will not be permitted to change the name of an component to match that +of another component. +@end ftable +@c ./../src/main.c 878 +@ftable @code +@item --snap-pin +If set, pin centers and pad end points are treated as additional grid points +that the cursor can snap to. +@end ftable +@c ./../src/main.c 892 +@ftable @code +@item --all-direction-lines +Allow all directions, when drawing new lines. +@end ftable +@c ./../src/main.c 897 +@ftable @code +@item --show-number +Pinout shows number. +@end ftable +@c options GTK+ GUI Options +@node GTK+ GUI Options +@section GTK+ GUI Options +@c ./../src/hid/gtk/gui-top-window.c 1615 +@ftable @code +@item --listen +Listen for actions on stdin. +@end ftable +@c ./../src/hid/gtk/gui-top-window.c 1621 +@ftable @code +@item --bg-image +File name of an image to put into the background of the GUI canvas. The image must +be a color PPM image, in binary (not ASCII) format. It can be any size, and will be +automatically scaled to fit the canvas. +@end ftable +@c ./../src/hid/gtk/gui-top-window.c 1627 +@ftable @code +@item --pcb-menu +Location of the @file{gpcb-menu.res} file which defines the menu for the GTK+ GUI. +@end ftable +@c options lesstif GUI Options +@node lesstif GUI Options +@section lesstif GUI Options +@c ./../src/hid/lesstif/main.c 201 +@ftable @code +@item --listen +Listen for actions on stdin. +@end ftable +@c ./../src/hid/lesstif/main.c 207 +@ftable @code +@item --bg-image +File name of an image to put into the background of the GUI canvas. The image must +be a color PPM image, in binary (not ASCII) format. It can be any size, and will be +automatically scaled to fit the canvas. +@end ftable +@c ./../src/hid/lesstif/main.c 213 +@ftable @code +@item --pcb-menu +Location of the @file{pcb-menu.res} file which defines the menu for the lesstif GUI. +@end ftable +@c options Colors +@node Colors +@section Colors +@c ./../src/main.c 473 +@ftable @code +@item --black-color +Color value for black. Default: @samp{#000000} +@end ftable +@c ./../src/main.c 477 +@ftable @code +@item --black-color +Color value for white. Default: @samp{#ffffff} +@end ftable +@c ./../src/main.c 481 +@ftable @code +@item --background-color +Background color of the canvas. Default: @samp{#e5e5e5} +@end ftable +@c ./../src/main.c 486 +@ftable @code +@item --crosshair-color +Color of the crosshair. Default: @samp{#ff0000} +@end ftable +@c ./../src/main.c 491 +@ftable @code +@item --cross-color +Color of the cross. Default: @samp{#cdcd00} +@end ftable +@c ./../src/main.c 495 +@ftable @code +@item --via-color +Color of vias. Default: @samp{#7f7f7f} +@end ftable +@c ./../src/main.c 499 +@ftable @code +@item --via-selected-color +Color of selected vias. Default: @samp{#00ffff} +@end ftable +@c ./../src/main.c 504 +@ftable @code +@item --pin-color +Color of pins. Default: @samp{#4d4d4d} +@end ftable +@c ./../src/main.c 508 +@ftable @code +@item --pin-selected-color +Color of selected pins. Default: @samp{#00ffff} +@end ftable +@c ./../src/main.c 513 +@ftable @code +@item --pin-name-color +Color of pin names and pin numbers. Default: @samp{#ff0000} +@end ftable +@c ./../src/main.c 518 +@ftable @code +@item --element-color +Color of components. Default: @samp{#000000} +@end ftable +@c ./../src/main.c 522 +@ftable @code +@item --rat-color +Color of ratlines. Default: @samp{#b8860b} +@end ftable +@c ./../src/main.c 526 +@ftable @code +@item --invisible-objects-color +Color of invisible objects. Default: @samp{#cccccc} +@end ftable +@c ./../src/main.c 531 +@ftable @code +@item --invisible-mark-color +Color of invisible marks. Default: @samp{#cccccc} +@end ftable +@c ./../src/main.c 536 +@ftable @code +@item --element-selected-color +Color of selected components. Default: @samp{#00ffff} +@end ftable +@c ./../src/main.c 541 +@ftable @code +@item --rat-selected-color +Color of selected rats. Default: @samp{#00ffff} +@end ftable +@c ./../src/main.c 546 +@ftable @code +@item --connected-color +Color to indicate connections. Default: @samp{#00ff00} +@end ftable +@c ./../src/main.c 551 +@ftable @code +@item --off-limit-color +Color of off-canvas area. Default: @samp{#cccccc} +@end ftable +@c ./../src/main.c 556 +@ftable @code +@item --grid-color +Color of the grid. Default: @samp{#ff0000} +@end ftable +@c ./../src/main.c 560 +@ftable @code +@item --layer-color- +Color of layer @code{}, where @code{} is an integer from 1 to 16. +@end ftable +@c ./../src/main.c 578 +@ftable @code +@item --layer-selected-color- +Color of layer @code{}, when selected. @code{} is an integer from 1 to 16. +@end ftable +@c ./../src/main.c 597 +@ftable @code +@item --warn-color +Color of offending objects during DRC. Default value is @code{"#ff8000"} +@end ftable +@c ./../src/main.c 601 +@ftable @code +@item --mask-color +Color of the mask layer. Default value is @code{"#ff0000"} +@end ftable +@c options Layer Names +@node Layer Names +@section Layer Names +@c ./../src/main.c 691 +@ftable @code +@item --layer-name-1 +Name of the 1st Layer. Default is @code{"top"}. +@end ftable +@c ./../src/main.c 695 +@ftable @code +@item --layer-name-2 +Name of the 2nd Layer. Default is @code{"ground"}. +@end ftable +@c ./../src/main.c 699 +@ftable @code +@item --layer-name-3 +Name of the 3nd Layer. Default is @code{"signal2"}. +@end ftable +@c ./../src/main.c 703 +@ftable @code +@item --layer-name-4 +Name of the 4rd Layer. Default is @code{"signal3"}. +@end ftable +@c ./../src/main.c 707 +@ftable @code +@item --layer-name-5 +Name of the 5rd Layer. Default is @code{"power"}. +@end ftable +@c ./../src/main.c 711 +@ftable @code +@item --layer-name-6 +Name of the 6rd Layer. Default is @code{"bottom"}. +@end ftable +@c ./../src/main.c 715 +@ftable @code +@item --layer-name-7 +Name of the 7rd Layer. Default is @code{"outline"}. +@end ftable +@c ./../src/main.c 719 +@ftable @code +@item --layer-name-8 +Name of the 8rd Layer. Default is @code{"spare"}. +@end ftable +@c options Paths +@node Paths +@section Paths +@c ./../src/main.c 769 +@ftable @code +@item --lib-newlib +Top level directory for the newlib style library. +@end ftable +@c ./../src/main.c 778 +@ftable @code +@item --lib-name +The default filename for the library. +@end ftable +@c ./../src/main.c 783 +@ftable @code +@item --default-font +The name of the default font. +@end ftable +@c ./../src/main.c 794 +@ftable @code +@item --file-path +A colon separated list of directories or commands (starts with '|'). The path +is passed to the program specified in @option{--file-command} together with the selected +filename. +@end ftable +@c ./../src/main.c 802 +@ftable @code +@item --font-path +A colon separated list of directories to search the default font. Defaults to +the default library path. +@end ftable +@c ./../src/main.c 812 +@ftable @code +@item --lib-path +A colon separated list of directories that will be passed to the commands specified +by @option{--element-command} and @option{--element-contents-command}. +@end ftable +@c options Sizes +@node Sizes +@section Sizes +@c ./../src/main.c 606 +All parameters should be given with an unit. If no unit is given, 1/100 mil +(cmil) will be used. Write units without space to the +number like @code{3mm}, not @code{3 mm}. +Valid Units are: + @table @samp + @item km + Kilometer + @item m + Meter + @item cm + Centimeter + @item mm + Millimeter + @item um + Micrometer + @item nm + Nanometer + @item in + Inch (1in = 0.0254m) + @item mil + Mil (1000mil = 1in) + @item cmil + Centimil (1/100 mil) +@end table + +@ftable @code +@item --via-thickness +Default diameter of vias. Default value is @code{60mil}. +@end ftable +@c ./../src/main.c 611 +@ftable @code +@item --via-drilling-hole +Default diameter of holes. Default value is @code{28mil}. +@end ftable +@c ./../src/main.c 616 +@ftable @code +@item --line-thickness +Default thickness of new lines. Default value is @code{10mil}. +@end ftable +@c ./../src/main.c 621 +@ftable @code +@item --rat-thickness +Thickness of rats. Values from 1 to 19 are fixed width in screen pixels. +Anything larger means PCB units (i.e. 100 means "1 mil"). Default value +is @code{10mil}. +@end ftable +@c ./../src/main.c 625 +@ftable @code +@item --keepaway +Default minimum distance between a track and adjacent copper. +Default value is @code{10mil}. +@end ftable +@c ./../src/main.c 629 +@ftable @code +@item --default-PCB-width +Default width of the canvas. Default value is @code{6000mil}. +@end ftable +@c ./../src/main.c 634 +@ftable @code +@item --default-PCB-height +Default height of the canvas. Default value is @code{5000mil}. +@end ftable +@c ./../src/main.c 639 +@ftable @code +@item --text-scale +Default text scale. This value is in percent. Default value is @code{100}. +@end ftable +@c ./../src/main.c 643 +@ftable @code +@item --alignment-distance +Specifies the distance between the board outline and alignment targets. +Default value is @code{2mil}. +@end ftable +@c ./../src/main.c 677 +@ftable @code +@item --grid +Initial grid size. Default value is @code{10mil}. +@end ftable +@c ./../src/main.c 681 +@ftable @code +@item --minimum polygon area +Minimum polygon area. +@end ftable +@c options Commands +@node Commands +@section Commands +@c ./../src/main.c 728 +pcb uses external commands for input output operations. These commands can be +configured at start-up to meet local requirements. The command string may include +special sequences @code{%f}, @code{%p} or @code{%a}. These are replaced when the +command is called. The sequence @code{%f} is replaced by the file name, +@code{%p} gets the path and @code{%a} indicates a package name. +@c ./../src/main.c 731 +@ftable @code +@item --font-command +Command to load a font. +@end ftable +@c ./../src/main.c 735 +@ftable @code +@item --file-command +Command to read a file. +@end ftable +@c ./../src/main.c 739 +@ftable @code +@item --element-command +Command to read a footprint. @* +Defaults to @code{"M4PATH='%p';export M4PATH;echo 'include(%f)' | m4"} +@end ftable +@c ./../src/main.c 745 +@ftable @code +@item --print-file +Command to print to a file. +@end ftable +@c ./../src/main.c 749 +@ftable @code +@item --lib-command-dir +Path to the command that queries the library. +@end ftable +@c ./../src/main.c 754 +@ftable @code +@item --lib-command +Command to query the library. @* +Defaults to @code{"QueryLibrary.sh '%p' '%f' %a"} +@end ftable +@c ./../src/main.c 759 +@ftable @code +@item --lib-contents-command +Command to query the contents of the library. @* +Defaults to @code{"ListLibraryContents.sh %p %f"} or, +on Windows builds, an empty string (to disable this feature). +@end ftable +@c ./../src/main.c 774 +@ftable @code +@item --save-command +Command to save to a file. +@end ftable +@c ./../src/main.c 798 +@ftable @code +@item --rat-command +Command for reading a netlist. Sequence @code{%f} is replaced by the netlist filename. +@end ftable +@c options DRC Options +@node DRC Options +@section DRC Options +@c ./../src/main.c 648 +All parameters should be given with an unit. If no unit is given, 1/100 mil +(cmil) will be used for backward compability. Valid units are given in section +@ref{Sizes}. +@c ./../src/main.c 652 +@ftable @code +@item --bloat +Minimum spacing. Default value is @code{10mil}. +@end ftable +@c ./../src/main.c 656 +@ftable @code +@item --shrink +Minimum touching overlap. Default value is @code{10mil}. +@end ftable +@c ./../src/main.c 660 +@ftable @code +@item --min-width +Minimum width of copper. Default value is @code{10mil}. +@end ftable +@c ./../src/main.c 664 +@ftable @code +@item --min-silk +Minimum width of lines in silk. Default value is @code{10mil}. +@end ftable +@c ./../src/main.c 668 +@ftable @code +@item --min-drill +Minimum diameter of holes. Default value is @code{15mil}. +@end ftable +@c ./../src/main.c 672 +@ftable @code +@item --min-ring +Minimum width of annular ring. Default value is @code{10mil}. +@end ftable +@c options BOM Creation +@node BOM Creation +@section BOM Creation +@c ./../src/hid/bom/bom.c 30 +@ftable @code +@item --bomfile +Name of the BOM output file. +@end ftable +@c ./../src/hid/bom/bom.c 35 +@ftable @code +@item --xyfile +Name of the XY output file. +@end ftable +@c ./../src/hid/bom/bom.c 41 +@ftable @code +@item --xy-unit +Unit of XY dimensions. Defaults to mil. +@end ftable +@c options Gerber Export +@node Gerber Export +@section Gerber Export +@c ./../src/hid/gerber/gerber.c 338 +@ftable @code +@item --gerberfile +Gerber output file prefix. Can include a path. +@end ftable +@c ./../src/hid/gerber/gerber.c 344 +@ftable @code +@item --all-layers +Output contains all layers, even empty ones. +@end ftable +@c ./../src/hid/gerber/gerber.c 350 +@ftable @code +@item --verbose +Print file names and aperture counts on stdout. +@end ftable +@c options Postscript Export +@node Postscript Export +@section Postscript Export +@c ./../src/hid/ps/ps.c 149 +@ftable @code +@item --psfile +Name of the postscript output file. Can contain a path. +@end ftable +@c ./../src/hid/ps/ps.c 155 +@ftable @code +@cindex drill-helper +@item --drill-helper +Print a centering target in large drill holes. +@end ftable +@c ./../src/hid/ps/ps.c 161 +@ftable @code +@cindex align-marks +@item --align-marks +Print alignment marks on each sheet. This is meant to ease alignment during exposure. +@end ftable +@c ./../src/hid/ps/ps.c 167 +@ftable @code +@item --outline +Print the contents of the outline layer on each sheet. +@end ftable +@c ./../src/hid/ps/ps.c 172 +@ftable @code +@item --mirror +Print mirror image. +@end ftable +@c ./../src/hid/ps/ps.c 178 +@ftable @code +@item --fill-page +Scale output to make the board fit the page. +@end ftable +@c ./../src/hid/ps/ps.c 184 +@ftable @code +@item --auto-mirror +Print mirror image of appropriate layers. +@end ftable +@c ./../src/hid/ps/ps.c 190 +@ftable @code +@item --ps-color +Postscript output in color. +@end ftable +@c ./../src/hid/ps/ps.c 196 +@ftable @code +@cindex ps-bloat +@item --ps-bloat +Amount to add to trace/pad/pin edges. +@end ftable +@c ./../src/hid/ps/ps.c 202 +@ftable @code +@cindex ps-invert +@item --ps-invert +Draw objects as white-on-black. +@end ftable +@c ./../src/hid/ps/ps.c 208 +@ftable @code +@item --media +Size of the media, the postscript is fitted to. The parameter +@code{} can be any of the standard names for paper size: @samp{A0} +to @samp{A10}, @samp{B0} to @samp{B10}, @samp{Letter}, @samp{11x17}, +@samp{Ledger}, @samp{Legal}, @samp{Executive}, @samp{A-Size}, @samp{B-size}, +@samp{C-Size}, @samp{D-size}, @samp{E-size}, @samp{US-Business_Card}, +@samp{Intl-Business_Card}. +@end ftable +@c ./../src/hid/ps/ps.c 214 +@ftable @code +@cindex psfade +@item --psfade +Fade amount for assembly drawings (0.0=missing, 1.0=solid). +@end ftable +@c ./../src/hid/ps/ps.c 220 +@ftable @code +@item --scale +Scale value to compensate for printer sizing errors (1.0 = full scale). +@end ftable +@c ./../src/hid/ps/ps.c 226 +@ftable @code +@cindex multi-file +@item --multi-file +Produce multiple files, one per page, instead of a single multi page file. +@end ftable +@c ./../src/hid/ps/ps.c 232 +@ftable @code +@item --xcalib +Paper width. Used for x-Axis calibration. +@end ftable +@c ./../src/hid/ps/ps.c 238 +@ftable @code +@item --ycalib +Paper height. Used for y-Axis calibration. +@end ftable +@c ./../src/hid/ps/ps.c 244 +@ftable @code +@item --drill-copper +Draw drill holes in pins / vias, instead of leaving solid copper. +@end ftable +@c ./../src/hid/ps/ps.c 250 +@ftable @code +@cindex show-legend +@item --show-legend +Print file name and scale on printout. +@end ftable +@c options Encapsulated Postscript Export +@node Encapsulated Postscript Export +@section Encapsulated Postscript Export +@c ./../src/hid/ps/eps.c 78 +@ftable @code +@item --eps-file +Name of the encapsulated postscript output file. Can contain a path. +@end ftable +@c ./../src/hid/ps/eps.c 84 +@ftable @code +@item --eps-scale +Scale EPS output by the parameter @samp{num}. +@end ftable +@c ./../src/hid/ps/eps.c 90 +@ftable @code +@cindex as-shown (EPS) +@item --as-shown +Export layers as shown on screen. +@end ftable +@c ./../src/hid/ps/eps.c 96 +@ftable @code +@item --monochrome +Convert output to monochrome. +@end ftable +@c ./../src/hid/ps/eps.c 102 +@ftable @code +@cindex only-visible +@item --only-visible +Limit the bounds of the EPS file to the visible items. +@end ftable +@c options PNG Options +@node PNG Options +@section PNG Options +@c ./../src/hid/png/png.c 168 +@ftable @code +@item --outfile +Name of the file to be exported to. Can contain a path. +@end ftable +@c ./../src/hid/png/png.c 174 +@ftable @code +@item --dpi +Scale factor in pixels/inch. Set to 0 to scale to size specified in the layout. +@end ftable +@c ./../src/hid/png/png.c 180 +@ftable @code +@item --x-max +Width of the png image in pixels. No constraint, when set to 0. +@end ftable +@c ./../src/hid/png/png.c 186 +@ftable @code +@item --y-max +Height of the png output in pixels. No constraint, when set to 0. +@end ftable +@c ./../src/hid/png/png.c 192 +@ftable @code +@item --xy-max +Maximum width and height of the PNG output in pixels. No constraint, when set to 0. +@end ftable +@c ./../src/hid/png/png.c 198 +@ftable @code +@item --as-shown +Export layers as shown on screen. +@end ftable +@c ./../src/hid/png/png.c 204 +@ftable @code +@item --monochrome +Convert output to monochrome. +@end ftable +@c ./../src/hid/png/png.c 210 +@ftable @code +@item --only-vivible +Limit the bounds of the exported PNG image to the visible items. +@end ftable +@c ./../src/hid/png/png.c 216 +@ftable @code +@item --use-alpha +Make the background and any holes transparent. +@end ftable +@c ./../src/hid/png/png.c 222 +@ftable @code +@item --format +File format to be exported. Parameter @code{} can be @samp{PNG}, +@samp{GIF}, or @samp{JPEG}. +@end ftable +@c ./../src/hid/png/png.c 228 +@ftable @code +@item --png-bloat +Amount of extra thickness to add to traces, pads, or pin edges. The parameter +@samp{} is a number, appended by a dimension @samp{mm}, @samp{mil}, or +@samp{pix}. If no dimension is given, the default dimension is 1/100 mil. +@end ftable +@c ./../src/hid/png/png.c 234 +@ftable @code +@cindex photo-mode +@item --photo-mode +Export a photo realistic image of the layout. +@end ftable +@c ./../src/hid/png/png.c 240 +@ftable @code +@item --photo-flip-x +In photo-realistic mode, export the reverse side of the layout. Left-right flip. +@end ftable +@c ./../src/hid/png/png.c 246 +@ftable @code +@item --photo-flip-y +In photo-realistic mode, export the reverse side of the layout. Up-down flip. +@end ftable +@c options lpr Printing Options +@node lpr Printing Options +@section lpr Printing Options +@c ./../src/hid/lpr/lpr.c 33 +@ftable @code +@item --lprcommand +Command to use for printing. Defaults to @code{lpr}. This can be used to produce +PDF output with a virtual PDF printer. Example: @* +@code{--lprcommand "lp -d CUPS-PDF-Printer"}. +@end ftable +@noindent In addition, all @ref{Postscript Export} options are valid. +@c options nelma Options +@node nelma Options +@section nelma Options +@c ./../src/hid/nelma/nelma.c 157 +@ftable @code +@item -- basename +File name prefix. +@end ftable +@c ./../src/hid/nelma/nelma.c 163 +@ftable @code +@item --dpi +Horizontal scale factor (grid points/inch). +@end ftable +@c ./../src/hid/nelma/nelma.c 169 +@ftable @code +@item --copper-height +Copper layer height (um). +@end ftable +@c ./../src/hid/nelma/nelma.c 175 +@ftable @code +@item --substrate-height +Substrate layer height (um). +@end ftable +@c ./../src/hid/nelma/nelma.c 181 +@ftable @code +@item --substrate-epsilon +Substrate relative epsilon. +@end ftable diff -Nru pcb-20100929/doc/pad.eps pcb-20110918/doc/pad.eps --- pcb-20100929/doc/pad.eps 2010-09-29 20:55:25.000000000 +0000 +++ pcb-20110918/doc/pad.eps 1970-01-01 00:00:00.000000000 +0000 @@ -1,878 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%BoundingBox: 0 0 221 129 -%%Pages: 1 -save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def -%%EndProlog -%%Page: 1 1 -%%BeginDocument: pad.eps - -72 72 scale -0.00001 dup neg scale -1 dup scale --39200 -212803 translate -/nclip { 38200 33200 moveto 38200 213803 lineto 346651 213803 lineto 346651 33200 lineto 38200 33200 lineto eoclip newpath } def -/t { moveto lineto stroke } bind def -/tc { moveto lineto strokepath nclip } bind def -/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def - x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def -/c { 0 360 arc fill } bind def -/cc { 0 360 arc nclip } bind def -/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def -% Layer component group 0 drill 0 mask 0 -1000 setlinewidth -1 setlinecap -0.545098 0.137255 0.137255 setrgbcolor -106000 144000 262000 144000 t -106000 144000 106000 84000 t -106000 84000 262000 84000 t -262000 84000 262000 144000 t -% Layer signal1 group 4 drill 0 mask 0 -0.329412 0.545098 0.329412 setrgbcolor -118000 96000 moveto -250000 96000 lineto -250000 132000 lineto -118000 132000 lineto -fill -% Layer solder group 1 drill 0 mask 0 -0.227451 0.372549 0.803922 setrgbcolor -256000 90000 256000 138000 t -112000 138000 112000 90000 t -112000 90000 256000 90000 t -112000 138000 256000 138000 t -% Layer topsilk group -4079 drill 0 mask 0 -500 setlinewidth -0 0 0 setrgbcolor -214000 76000 250000 76000 t -218000 72000 214000 76000 t -214000 76000 218000 80000 t -214000 96000 214000 132000 t -236000 124000 232000 120000 t -1010 setlinewidth -232000 110000 232000 118000 t -500 setlinewidth -232000 120000 228000 124000 t -204000 114000 212000 114000 t -212000 114000 208000 110000 t -212000 114000 208000 118000 t -214000 94000 214000 70000 t -204000 114000 204000 48000 t -1010 setlinewidth -228000 114000 236000 114000 t -500 setlinewidth -250000 94000 250000 70000 t -250000 96000 214000 96000 t -250000 76000 246000 72000 t -250000 76000 246000 80000 t -186000 96000 190000 92000 t -186000 96000 182000 92000 t -186000 64000 186000 96000 t -118000 132000 154000 132000 t -136000 152000 136000 120000 t -136000 120000 132000 124000 t -140000 124000 136000 120000 t -160000 138000 112000 138000 t -118000 96000 118000 132000 t -112000 90000 112000 138000 t -154000 132000 154000 96000 t -154000 96000 118000 96000 t -1010 setlinewidth -132000 114000 140000 114000 t -136000 110000 136000 118000 t -500 setlinewidth -160000 90000 160000 138000 t -98000 138000 98000 90000 t -98000 138000 94000 134000 t -98000 138000 102000 134000 t -92000 138000 110000 138000 t -168000 144000 164000 148000 t -172000 148000 168000 144000 t -168000 132000 172000 128000 t -168000 132000 164000 128000 t -168000 120000 168000 132000 t -270000 96000 266000 100000 t -270000 96000 274000 100000 t -252000 96000 276000 96000 t -250000 132000 250000 96000 t -270000 132000 270000 96000 t -214000 132000 250000 132000 t -232000 150000 232000 120000 t -252000 132000 276000 132000 t -270000 132000 266000 128000 t -270000 132000 274000 128000 t -214000 138000 210000 142000 t -214000 168000 214000 138000 t -218000 142000 214000 138000 t -98000 90000 94000 94000 t -92000 90000 110000 90000 t -98000 90000 102000 94000 t -136000 90000 140000 86000 t -136000 90000 132000 86000 t -160000 90000 112000 90000 t -136000 74000 136000 90000 t -192000 144000 188000 148000 t -196000 148000 192000 144000 t -192000 184000 192000 144000 t -168000 176000 168000 144000 t -800 setlinewidth -224000 159000 225000 160000 t -224000 153000 225000 152000 t -224000 153000 224000 159000 t -227402 152000 227402 153000 t -227402 153000 232402 158000 t -232402 158000 232402 160000 t -227402 158000 227402 160000 t -227402 158000 232402 153000 t -232402 152000 232402 153000 t -235804 160000 237804 160000 t -236804 152000 236804 160000 t -234804 154000 236804 152000 t -240206 162000 242206 160000 t -244608 152000 244608 153000 t -244608 153000 246608 155000 t -246608 155000 248608 153000 t -248608 152000 248608 153000 t -246608 155000 246608 160000 t -252010 160000 254010 160000 t -253010 152000 253010 160000 t -251010 154000 253010 152000 t -256412 152000 257412 153000 t -257412 153000 257412 159000 t -256412 160000 257412 159000 t -228000 68000 229000 67000 t -228000 68000 228000 71000 t -229000 72000 228000 71000 t -229000 72000 231000 72000 t -231000 72000 232000 71000 t -232000 68000 232000 71000 t -232000 68000 233000 67000 t -233000 67000 235000 67000 t -236000 68000 235000 67000 t -236000 68000 236000 71000 t -235000 72000 236000 71000 t -228000 62598 228000 64598 t -228000 63598 236000 63598 t -236000 62598 236000 64598 t -228000 55196 228000 60196 t -228000 55196 229000 55196 t -234000 60196 229000 55196 t -234000 60196 236000 60196 t -236000 55196 236000 60196 t -232000 49794 232000 52794 t -236000 48794 236000 52794 t -228000 52794 236000 52794 t -228000 48794 228000 52794 t -276000 112000 277000 113000 t -273000 112000 276000 112000 t -272000 113000 273000 112000 t -272000 113000 272000 115000 t -272000 115000 273000 116000 t -273000 116000 276000 116000 t -276000 116000 277000 117000 t -277000 117000 277000 119000 t -276000 120000 277000 119000 t -273000 120000 276000 120000 t -272000 119000 273000 120000 t -279402 112000 281402 112000 t -280402 112000 280402 120000 t -279402 120000 281402 120000 t -283804 112000 288804 112000 t -288804 112000 288804 113000 t -283804 118000 288804 113000 t -283804 118000 283804 120000 t -283804 120000 288804 120000 t -291206 116000 294206 116000 t -291206 120000 295206 120000 t -291206 112000 291206 120000 t -291206 112000 295206 112000 t -106000 161000 107000 162000 t -106000 155000 107000 154000 t -106000 155000 106000 161000 t -109402 154000 109402 155000 t -109402 155000 114402 160000 t -114402 160000 114402 162000 t -109402 160000 109402 162000 t -109402 160000 114402 155000 t -114402 154000 114402 155000 t -116804 161000 117804 162000 t -116804 155000 116804 161000 t -116804 155000 117804 154000 t -117804 154000 119804 154000 t -119804 154000 120804 155000 t -120804 155000 120804 161000 t -119804 162000 120804 161000 t -117804 162000 119804 162000 t -116804 160000 120804 156000 t -123206 164000 125206 162000 t -127608 154000 127608 155000 t -127608 155000 129608 157000 t -129608 157000 131608 155000 t -131608 154000 131608 155000 t -129608 157000 129608 162000 t -134010 161000 135010 162000 t -134010 155000 134010 161000 t -134010 155000 135010 154000 t -135010 154000 137010 154000 t -137010 154000 138010 155000 t -138010 155000 138010 161000 t -137010 162000 138010 161000 t -135010 162000 137010 162000 t -134010 160000 138010 156000 t -140412 154000 141412 155000 t -141412 155000 141412 161000 t -140412 162000 141412 161000 t -41000 108000 41000 116000 t -41000 108000 44000 111000 t -44000 111000 47000 108000 t -47000 108000 47000 116000 t -52402 112000 53402 113000 t -50402 112000 52402 112000 t -49402 113000 50402 112000 t -49402 113000 49402 115000 t -49402 115000 50402 116000 t -53402 112000 53402 115000 t -53402 115000 54402 116000 t -50402 116000 52402 116000 t -52402 116000 53402 115000 t -57804 116000 60804 116000 t -60804 116000 61804 115000 t -60804 114000 61804 115000 t -57804 114000 60804 114000 t -56804 113000 57804 114000 t -56804 113000 57804 112000 t -57804 112000 60804 112000 t -60804 112000 61804 113000 t -56804 115000 57804 116000 t -64206 108000 64206 116000 t -64206 113000 67206 116000 t -64206 113000 66206 111000 t -77208 108000 78208 109000 t -74208 108000 77208 108000 t -73208 109000 74208 108000 t -73208 109000 73208 111000 t -73208 111000 74208 112000 t -74208 112000 77208 112000 t -77208 112000 78208 113000 t -78208 113000 78208 115000 t -77208 116000 78208 115000 t -74208 116000 77208 116000 t -73208 115000 74208 116000 t -80610 110000 80610 111000 t -80610 113000 80610 116000 t -82612 112000 86612 112000 t -82612 116000 86612 112000 t -82612 116000 86612 116000 t -90014 116000 93014 116000 t -89014 115000 90014 116000 t -89014 113000 89014 115000 t -89014 113000 90014 112000 t -90014 112000 92014 112000 t -92014 112000 93014 113000 t -89014 114000 93014 114000 t -93014 113000 93014 114000 t -56000 64000 56000 72000 t -56000 64000 59000 67000 t -59000 67000 62000 64000 t -62000 64000 62000 72000 t -67402 68000 68402 69000 t -65402 68000 67402 68000 t -64402 69000 65402 68000 t -64402 69000 64402 71000 t -64402 71000 65402 72000 t -68402 68000 68402 71000 t -68402 71000 69402 72000 t -65402 72000 67402 72000 t -67402 72000 68402 71000 t -72804 72000 75804 72000 t -75804 72000 76804 71000 t -75804 70000 76804 71000 t -72804 70000 75804 70000 t -71804 69000 72804 70000 t -71804 69000 72804 68000 t -72804 68000 75804 68000 t -75804 68000 76804 69000 t -71804 71000 72804 72000 t -79206 64000 79206 72000 t -79206 69000 82206 72000 t -79206 69000 81206 67000 t -88208 65000 88208 72000 t -88208 65000 89208 64000 t -89208 64000 92208 64000 t -92208 64000 93208 65000 t -93208 65000 93208 72000 t -88208 68000 93208 68000 t -96610 69000 96610 75000 t -95610 68000 96610 69000 t -96610 69000 97610 68000 t -97610 68000 99610 68000 t -99610 68000 100610 69000 t -100610 69000 100610 71000 t -99610 72000 100610 71000 t -97610 72000 99610 72000 t -96610 71000 97610 72000 t -104012 72000 107012 72000 t -103012 71000 104012 72000 t -103012 69000 103012 71000 t -103012 69000 104012 68000 t -104012 68000 106012 68000 t -106012 68000 107012 69000 t -103012 70000 107012 70000 t -107012 69000 107012 70000 t -110414 69000 110414 72000 t -110414 69000 111414 68000 t -111414 68000 113414 68000 t -109414 68000 110414 69000 t -116816 64000 116816 71000 t -116816 71000 117816 72000 t -115816 67000 117816 67000 t -119818 68000 119818 71000 t -119818 71000 120818 72000 t -120818 72000 122818 72000 t -122818 72000 123818 71000 t -123818 68000 123818 71000 t -127220 69000 127220 72000 t -127220 69000 128220 68000 t -128220 68000 130220 68000 t -126220 68000 127220 69000 t -133622 72000 136622 72000 t -132622 71000 133622 72000 t -132622 69000 132622 71000 t -132622 69000 133622 68000 t -133622 68000 135622 68000 t -135622 68000 136622 69000 t -132622 70000 136622 70000 t -136622 69000 136622 70000 t -131000 54000 131000 62000 t -130000 54000 134000 54000 t -134000 54000 135000 55000 t -135000 55000 135000 57000 t -134000 58000 135000 57000 t -131000 58000 134000 58000 t -140402 58000 141402 59000 t -138402 58000 140402 58000 t -137402 59000 138402 58000 t -137402 59000 137402 61000 t -137402 61000 138402 62000 t -141402 58000 141402 61000 t -141402 61000 142402 62000 t -138402 62000 140402 62000 t -140402 62000 141402 61000 t -148804 54000 148804 62000 t -147804 62000 148804 61000 t -145804 62000 147804 62000 t -144804 61000 145804 62000 t -144804 59000 144804 61000 t -144804 59000 145804 58000 t -145804 58000 147804 58000 t -147804 58000 148804 59000 t -158806 54000 159806 55000 t -155806 54000 158806 54000 t -154806 55000 155806 54000 t -154806 55000 154806 57000 t -154806 57000 155806 58000 t -155806 58000 158806 58000 t -158806 58000 159806 59000 t -159806 59000 159806 61000 t -158806 62000 159806 61000 t -155806 62000 158806 62000 t -154806 61000 155806 62000 t -162208 54000 162208 62000 t -162208 59000 163208 58000 t -163208 58000 165208 58000 t -165208 58000 166208 59000 t -166208 59000 166208 62000 t -171610 58000 172610 59000 t -169610 58000 171610 58000 t -168610 59000 169610 58000 t -168610 59000 168610 61000 t -168610 61000 169610 62000 t -172610 58000 172610 61000 t -172610 61000 173610 62000 t -169610 62000 171610 62000 t -171610 62000 172610 61000 t -177012 59000 177012 65000 t -176012 58000 177012 59000 t -177012 59000 178012 58000 t -178012 58000 180012 58000 t -180012 58000 181012 59000 t -181012 59000 181012 61000 t -180012 62000 181012 61000 t -178012 62000 180012 62000 t -177012 61000 178012 62000 t -184414 62000 187414 62000 t -183414 61000 184414 62000 t -183414 59000 183414 61000 t -183414 59000 184414 58000 t -184414 58000 186414 58000 t -186414 58000 187414 59000 t -183414 60000 187414 60000 t -187414 59000 187414 60000 t -133000 38000 133000 46000 t -132000 38000 136000 38000 t -136000 38000 137000 39000 t -137000 39000 137000 41000 t -136000 42000 137000 41000 t -133000 42000 136000 42000 t -142402 42000 143402 43000 t -140402 42000 142402 42000 t -139402 43000 140402 42000 t -139402 43000 139402 45000 t -139402 45000 140402 46000 t -143402 42000 143402 45000 t -143402 45000 144402 46000 t -140402 46000 142402 46000 t -142402 46000 143402 45000 t -150804 38000 150804 46000 t -149804 46000 150804 45000 t -147804 46000 149804 46000 t -146804 45000 147804 46000 t -146804 43000 146804 45000 t -146804 43000 147804 42000 t -147804 42000 149804 42000 t -149804 42000 150804 43000 t -156806 39000 156806 46000 t -156806 39000 157806 38000 t -157806 38000 160806 38000 t -160806 38000 161806 39000 t -161806 39000 161806 46000 t -156806 42000 161806 42000 t -165208 43000 165208 49000 t -164208 42000 165208 43000 t -165208 43000 166208 42000 t -166208 42000 168208 42000 t -168208 42000 169208 43000 t -169208 43000 169208 45000 t -168208 46000 169208 45000 t -166208 46000 168208 46000 t -165208 45000 166208 46000 t -172610 46000 175610 46000 t -171610 45000 172610 46000 t -171610 43000 171610 45000 t -171610 43000 172610 42000 t -172610 42000 174610 42000 t -174610 42000 175610 43000 t -171610 44000 175610 44000 t -175610 43000 175610 44000 t -179012 43000 179012 46000 t -179012 43000 180012 42000 t -180012 42000 182012 42000 t -178012 42000 179012 43000 t -185414 38000 185414 45000 t -185414 45000 186414 46000 t -184414 41000 186414 41000 t -188416 42000 188416 45000 t -188416 45000 189416 46000 t -189416 46000 191416 46000 t -191416 46000 192416 45000 t -192416 42000 192416 45000 t -195818 43000 195818 46000 t -195818 43000 196818 42000 t -196818 42000 198818 42000 t -194818 42000 195818 43000 t -202220 46000 205220 46000 t -201220 45000 202220 46000 t -201220 43000 201220 45000 t -201220 43000 202220 42000 t -202220 42000 204220 42000 t -204220 42000 205220 43000 t -201220 44000 205220 44000 t -205220 43000 205220 44000 t -214000 170000 215000 171000 t -211000 170000 214000 170000 t -210000 171000 211000 170000 t -210000 171000 210000 173000 t -210000 173000 211000 174000 t -211000 174000 214000 174000 t -214000 174000 215000 175000 t -215000 175000 215000 177000 t -214000 178000 215000 177000 t -211000 178000 214000 178000 t -210000 177000 211000 178000 t -217402 175000 217402 177000 t -217402 175000 218402 174000 t -218402 174000 220402 174000 t -220402 174000 221402 175000 t -221402 175000 221402 177000 t -220402 178000 221402 177000 t -218402 178000 220402 178000 t -217402 177000 218402 178000 t -223804 170000 223804 177000 t -223804 177000 224804 178000 t -230806 170000 230806 178000 t -229806 178000 230806 177000 t -227806 178000 229806 178000 t -226806 177000 227806 178000 t -226806 175000 226806 177000 t -226806 175000 227806 174000 t -227806 174000 229806 174000 t -229806 174000 230806 175000 t -234208 178000 237208 178000 t -233208 177000 234208 178000 t -233208 175000 233208 177000 t -233208 175000 234208 174000 t -234208 174000 236208 174000 t -236208 174000 237208 175000 t -233208 176000 237208 176000 t -237208 175000 237208 176000 t -240610 175000 240610 178000 t -240610 175000 241610 174000 t -241610 174000 243610 174000 t -239610 174000 240610 175000 t -247012 175000 247012 178000 t -247012 175000 248012 174000 t -248012 174000 249012 174000 t -249012 174000 250012 175000 t -250012 175000 250012 178000 t -250012 175000 251012 174000 t -251012 174000 252012 174000 t -252012 174000 253012 175000 t -253012 175000 253012 178000 t -246012 174000 247012 175000 t -258414 174000 259414 175000 t -256414 174000 258414 174000 t -255414 175000 256414 174000 t -255414 175000 255414 177000 t -255414 177000 256414 178000 t -259414 174000 259414 177000 t -259414 177000 260414 178000 t -256414 178000 258414 178000 t -258414 178000 259414 177000 t -263816 178000 266816 178000 t -266816 178000 267816 177000 t -266816 176000 267816 177000 t -263816 176000 266816 176000 t -262816 175000 263816 176000 t -262816 175000 263816 174000 t -263816 174000 266816 174000 t -266816 174000 267816 175000 t -262816 177000 263816 178000 t -270218 170000 270218 178000 t -270218 175000 273218 178000 t -270218 175000 272218 173000 t -279220 171000 279220 177000 t -279220 171000 280220 170000 t -280220 170000 282220 170000 t -282220 170000 283220 171000 t -283220 171000 283220 177000 t -282220 178000 283220 177000 t -280220 178000 282220 178000 t -279220 177000 280220 178000 t -286622 175000 286622 181000 t -285622 174000 286622 175000 t -286622 175000 287622 174000 t -287622 174000 289622 174000 t -289622 174000 290622 175000 t -290622 175000 290622 177000 t -289622 178000 290622 177000 t -287622 178000 289622 178000 t -286622 177000 287622 178000 t -294024 178000 297024 178000 t -293024 177000 294024 178000 t -293024 175000 293024 177000 t -293024 175000 294024 174000 t -294024 174000 296024 174000 t -296024 174000 297024 175000 t -293024 176000 297024 176000 t -297024 175000 297024 176000 t -300426 175000 300426 178000 t -300426 175000 301426 174000 t -301426 174000 302426 174000 t -302426 174000 303426 175000 t -303426 175000 303426 178000 t -299426 174000 300426 175000 t -305828 172000 305828 173000 t -305828 175000 305828 178000 t -308830 175000 308830 178000 t -308830 175000 309830 174000 t -309830 174000 310830 174000 t -310830 174000 311830 175000 t -311830 175000 311830 178000 t -307830 174000 308830 175000 t -317232 174000 318232 175000 t -315232 174000 317232 174000 t -314232 175000 315232 174000 t -314232 175000 314232 177000 t -314232 177000 315232 178000 t -315232 178000 317232 178000 t -317232 178000 318232 177000 t -314232 180000 315232 181000 t -315232 181000 317232 181000 t -317232 181000 318232 180000 t -318232 174000 318232 180000 t -103000 186000 106000 186000 t -102000 185000 103000 186000 t -102000 179000 102000 185000 t -102000 179000 103000 178000 t -103000 178000 106000 178000 t -108402 178000 108402 185000 t -108402 185000 109402 186000 t -112404 186000 115404 186000 t -111404 185000 112404 186000 t -111404 183000 111404 185000 t -111404 183000 112404 182000 t -112404 182000 114404 182000 t -114404 182000 115404 183000 t -111404 184000 115404 184000 t -115404 183000 115404 184000 t -120806 182000 121806 183000 t -118806 182000 120806 182000 t -117806 183000 118806 182000 t -117806 183000 117806 185000 t -117806 185000 118806 186000 t -121806 182000 121806 185000 t -121806 185000 122806 186000 t -118806 186000 120806 186000 t -120806 186000 121806 185000 t -126208 183000 126208 186000 t -126208 183000 127208 182000 t -127208 182000 129208 182000 t -125208 182000 126208 183000 t -134610 182000 135610 183000 t -132610 182000 134610 182000 t -131610 183000 132610 182000 t -131610 183000 131610 185000 t -131610 185000 132610 186000 t -135610 182000 135610 185000 t -135610 185000 136610 186000 t -132610 186000 134610 186000 t -134610 186000 135610 185000 t -140012 183000 140012 186000 t -140012 183000 141012 182000 t -141012 182000 142012 182000 t -142012 182000 143012 183000 t -143012 183000 143012 186000 t -139012 182000 140012 183000 t -146414 182000 149414 182000 t -145414 183000 146414 182000 t -145414 183000 145414 185000 t -145414 185000 146414 186000 t -146414 186000 149414 186000 t -152816 186000 155816 186000 t -151816 185000 152816 186000 t -151816 183000 151816 185000 t -151816 183000 152816 182000 t -152816 182000 154816 182000 t -154816 182000 155816 183000 t -151816 184000 155816 184000 t -155816 183000 155816 184000 t -158218 185000 164218 179000 t -166620 179000 167620 178000 t -167620 178000 170620 178000 t -170620 178000 171620 179000 t -171620 179000 171620 181000 t -166620 186000 171620 181000 t -166620 186000 171620 186000 t -189000 196000 192000 196000 t -188000 195000 189000 196000 t -188000 189000 188000 195000 t -188000 189000 189000 188000 t -189000 188000 192000 188000 t -194402 188000 194402 195000 t -194402 195000 195402 196000 t -198404 196000 201404 196000 t -197404 195000 198404 196000 t -197404 193000 197404 195000 t -197404 193000 198404 192000 t -198404 192000 200404 192000 t -200404 192000 201404 193000 t -197404 194000 201404 194000 t -201404 193000 201404 194000 t -206806 192000 207806 193000 t -204806 192000 206806 192000 t -203806 193000 204806 192000 t -203806 193000 203806 195000 t -203806 195000 204806 196000 t -207806 192000 207806 195000 t -207806 195000 208806 196000 t -204806 196000 206806 196000 t -206806 196000 207806 195000 t -212208 193000 212208 196000 t -212208 193000 213208 192000 t -213208 192000 215208 192000 t -211208 192000 212208 193000 t -220610 192000 221610 193000 t -218610 192000 220610 192000 t -217610 193000 218610 192000 t -217610 193000 217610 195000 t -217610 195000 218610 196000 t -221610 192000 221610 195000 t -221610 195000 222610 196000 t -218610 196000 220610 196000 t -220610 196000 221610 195000 t -226012 193000 226012 196000 t -226012 193000 227012 192000 t -227012 192000 228012 192000 t -228012 192000 229012 193000 t -229012 193000 229012 196000 t -225012 192000 226012 193000 t -232414 192000 235414 192000 t -231414 193000 232414 192000 t -231414 193000 231414 195000 t -231414 195000 232414 196000 t -232414 196000 235414 196000 t -238816 196000 241816 196000 t -237816 195000 238816 196000 t -237816 193000 237816 195000 t -237816 193000 238816 192000 t -238816 192000 240816 192000 t -240816 192000 241816 193000 t -237816 194000 241816 194000 t -241816 193000 241816 194000 t -248818 188000 248818 195000 t -248818 195000 249818 196000 t -247818 191000 249818 191000 t -251820 193000 251820 195000 t -251820 193000 252820 192000 t -252820 192000 254820 192000 t -254820 192000 255820 193000 t -255820 193000 255820 195000 t -254820 196000 255820 195000 t -252820 196000 254820 196000 t -251820 195000 252820 196000 t -262822 193000 262822 196000 t -262822 193000 263822 192000 t -263822 192000 264822 192000 t -264822 192000 265822 193000 t -265822 193000 265822 196000 t -261822 192000 262822 193000 t -268224 193000 268224 195000 t -268224 193000 269224 192000 t -269224 192000 271224 192000 t -271224 192000 272224 193000 t -272224 193000 272224 195000 t -271224 196000 272224 195000 t -269224 196000 271224 196000 t -268224 195000 269224 196000 t -275626 193000 275626 196000 t -275626 193000 276626 192000 t -276626 192000 277626 192000 t -277626 192000 278626 193000 t -278626 193000 278626 196000 t -274626 192000 275626 193000 t -281028 192000 285028 192000 t -288430 192000 291430 192000 t -287430 193000 288430 192000 t -287430 193000 287430 195000 t -287430 195000 288430 196000 t -288430 196000 291430 196000 t -293832 193000 293832 195000 t -293832 193000 294832 192000 t -294832 192000 296832 192000 t -296832 192000 297832 193000 t -297832 193000 297832 195000 t -296832 196000 297832 195000 t -294832 196000 296832 196000 t -293832 195000 294832 196000 t -301234 193000 301234 196000 t -301234 193000 302234 192000 t -302234 192000 303234 192000 t -303234 192000 304234 193000 t -304234 193000 304234 196000 t -300234 192000 301234 193000 t -307636 193000 307636 196000 t -307636 193000 308636 192000 t -308636 192000 309636 192000 t -309636 192000 310636 193000 t -310636 193000 310636 196000 t -306636 192000 307636 193000 t -314038 196000 317038 196000 t -313038 195000 314038 196000 t -313038 193000 313038 195000 t -313038 193000 314038 192000 t -314038 192000 316038 192000 t -316038 192000 317038 193000 t -313038 194000 317038 194000 t -317038 193000 317038 194000 t -320440 192000 323440 192000 t -319440 193000 320440 192000 t -319440 193000 319440 195000 t -319440 195000 320440 196000 t -320440 196000 323440 196000 t -326842 188000 326842 195000 t -326842 195000 327842 196000 t -325842 191000 327842 191000 t -329844 190000 329844 191000 t -329844 193000 329844 196000 t -332846 193000 332846 196000 t -332846 193000 333846 192000 t -333846 192000 334846 192000 t -334846 192000 335846 193000 t -335846 193000 335846 196000 t -331846 192000 332846 193000 t -341248 192000 342248 193000 t -339248 192000 341248 192000 t -338248 193000 339248 192000 t -338248 193000 338248 195000 t -338248 195000 339248 196000 t -339248 196000 341248 196000 t -341248 196000 342248 195000 t -338248 198000 339248 199000 t -339248 199000 341248 199000 t -341248 199000 342248 198000 t -342248 192000 342248 198000 t -189000 205000 189000 211000 t -188000 204000 189000 205000 t -189000 205000 190000 204000 t -190000 204000 192000 204000 t -192000 204000 193000 205000 t -193000 205000 193000 207000 t -192000 208000 193000 207000 t -190000 208000 192000 208000 t -189000 207000 190000 208000 t -195402 205000 195402 207000 t -195402 205000 196402 204000 t -196402 204000 198402 204000 t -198402 204000 199402 205000 t -199402 205000 199402 207000 t -198402 208000 199402 207000 t -196402 208000 198402 208000 t -195402 207000 196402 208000 t -201804 200000 201804 207000 t -201804 207000 202804 208000 t -204806 204000 204806 207000 t -204806 207000 205806 208000 t -208806 204000 208806 210000 t -207806 211000 208806 210000 t -205806 211000 207806 211000 t -204806 210000 205806 211000 t -205806 208000 207806 208000 t -207806 208000 208806 207000 t -214208 204000 215208 205000 t -212208 204000 214208 204000 t -211208 205000 212208 204000 t -211208 205000 211208 207000 t -211208 207000 212208 208000 t -212208 208000 214208 208000 t -214208 208000 215208 207000 t -211208 210000 212208 211000 t -212208 211000 214208 211000 t -214208 211000 215208 210000 t -215208 204000 215208 210000 t -217610 205000 217610 207000 t -217610 205000 218610 204000 t -218610 204000 220610 204000 t -220610 204000 221610 205000 t -221610 205000 221610 207000 t -220610 208000 221610 207000 t -218610 208000 220610 208000 t -217610 207000 218610 208000 t -225012 205000 225012 208000 t -225012 205000 226012 204000 t -226012 204000 227012 204000 t -227012 204000 228012 205000 t -228012 205000 228012 208000 t -224012 204000 225012 205000 t -231414 208000 234414 208000 t -234414 208000 235414 207000 t -234414 206000 235414 207000 t -231414 206000 234414 206000 t -230414 205000 231414 206000 t -230414 205000 231414 204000 t -231414 204000 234414 204000 t -234414 204000 235414 205000 t -230414 207000 231414 208000 t -% Layer bottomsilk group -4078 drill 0 mask 0 -showpage -%%EndDocument -%%Trailer -cleartomark countdictstack exch sub { end } repeat restore -%%EOF Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/pad.gif and /tmp/7VS3dXhxjw/pcb-20110918/doc/pad.gif differ diff -Nru pcb-20100929/doc/pad.pcb pcb-20110918/doc/pad.pcb --- pcb-20100929/doc/pad.pcb 2009-01-29 01:20:12.000000000 +0000 +++ pcb-20110918/doc/pad.pcb 2011-01-28 03:55:02.000000000 +0000 @@ -1,6 +1,4 @@ # release: pcb-bin 1.99q -# date: Tue Mar 21 18:28:39 2006 -# user: mcmahill (Dan McMahill) PCB["pad" 600000 500000] Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/pad.pdf and /tmp/7VS3dXhxjw/pcb-20110918/doc/pad.pdf differ Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/pad.png and /tmp/7VS3dXhxjw/pcb-20110918/doc/pad.png differ Binary files /tmp/kCVl7BQdX7/pcb-20100929/doc/pcb.dvi and /tmp/7VS3dXhxjw/pcb-20110918/doc/pcb.dvi differ diff -Nru pcb-20100929/doc/pcbfile.texi pcb-20110918/doc/pcbfile.texi --- pcb-20100929/doc/pcbfile.texi 2010-09-29 20:55:25.000000000 +0000 +++ pcb-20110918/doc/pcbfile.texi 2011-09-18 20:09:04.000000000 +0000 @@ -1,5 +1,5 @@ @c key pcbfile -@c ./../src/parse_y.y 120 +@c ./../src/parse_y.y 143 A special note about units: Older versions of @code{pcb} used mils (1/1000 inch) as the base unit; a value of 500 in the file meant @@ -49,7 +49,7 @@ @c pcbfile Arc @node Arc syntax @subsection Arc -@c ./../src/parse_y.y 651 +@c ./../src/parse_y.y 660 @cartouche @format @@ -89,7 +89,7 @@ @c pcbfile Attribute @node Attribute syntax @subsection Attribute -@c ./../src/parse_y.y 1264 +@c ./../src/parse_y.y 1268 @cartouche @format @@ -114,7 +114,7 @@ @c pcbfile Connect @node Connect syntax @subsection Connect -@c ./../src/parse_y.y 1254 +@c ./../src/parse_y.y 1258 @cartouche @format @@ -132,7 +132,7 @@ @c pcbfile Cursor @node Cursor syntax @subsection Cursor -@c ./../src/parse_y.y 323 +@c ./../src/parse_y.y 335 @cartouche @format @@ -154,7 +154,7 @@ @c pcbfile DRC @node DRC syntax @subsection DRC -@c ./../src/parse_y.y 369 +@c ./../src/parse_y.y 376 @cartouche @format @@ -182,7 +182,7 @@ @c pcbfile Element @node Element syntax @subsection Element -@c ./../src/parse_y.y 808 +@c ./../src/parse_y.y 816 @cartouche @format @@ -238,7 +238,7 @@ @c pcbfile ElementArc @node ElementArc syntax @subsection ElementArc -@c ./../src/parse_y.y 917 +@c ./../src/parse_y.y 927 @cartouche @format @@ -270,7 +270,7 @@ @c pcbfile ElementLine @node ElementLine syntax @subsection ElementLine -@c ./../src/parse_y.y 915 +@c ./../src/parse_y.y 925 @cartouche @format @@ -291,7 +291,7 @@ @c pcbfile FileVersion @node FileVersion syntax @subsection FileVersion -@c ./../src/parse_y.y 233 +@c ./../src/parse_y.y 258 @cartouche @format @@ -313,7 +313,7 @@ @c pcbfile Flags @node Flags syntax @subsection Flags -@c ./../src/parse_y.y 411 +@c ./../src/parse_y.y 418 @cartouche @format @@ -331,7 +331,7 @@ @c pcbfile Grid @node Grid syntax @subsection Grid -@c ./../src/parse_y.y 269 +@c ./../src/parse_y.y 294 @cartouche @format @@ -354,7 +354,7 @@ @c pcbfile Groups @node Groups syntax @subsection Groups -@c ./../src/parse_y.y 425 +@c ./../src/parse_y.y 432 @cartouche @format @@ -381,7 +381,7 @@ @c pcbfile Layer @node Layer syntax @subsection Layer -@c ./../src/parse_y.y 565 +@c ./../src/parse_y.y 573 @cartouche @format @@ -406,7 +406,7 @@ @c pcbfile Line @node Line syntax @subsection Line -@c ./../src/parse_y.y 621 +@c ./../src/parse_y.y 629 @cartouche @format @@ -435,7 +435,7 @@ @c pcbfile Mark @node Mark syntax @subsection Mark -@c ./../src/parse_y.y 919 +@c ./../src/parse_y.y 929 @cartouche @format @@ -453,7 +453,7 @@ @c pcbfile Net @node Net syntax @subsection Net -@c ./../src/parse_y.y 1231 +@c ./../src/parse_y.y 1235 @cartouche @format @@ -473,7 +473,7 @@ @c pcbfile Netlist @node Netlist syntax @subsection Netlist -@c ./../src/parse_y.y 1210 +@c ./../src/parse_y.y 1214 @cartouche @format @@ -486,7 +486,7 @@ @c pcbfile Pad @node Pad syntax @subsection Pad -@c ./../src/parse_y.y 1076 +@c ./../src/parse_y.y 1086 @cartouche @format @@ -524,7 +524,7 @@ @c pcbfile PCB @node PCB syntax @subsection PCB -@c ./../src/parse_y.y 246 +@c ./../src/parse_y.y 271 @cartouche @format @@ -547,7 +547,7 @@ @c pcbfile Pin @node Pin syntax @subsection Pin -@c ./../src/parse_y.y 1003 +@c ./../src/parse_y.y 1013 @cartouche @format @@ -585,7 +585,7 @@ @c pcbfile PolyArea @node PolyArea syntax @subsection PolyArea -@c ./../src/parse_y.y 347 +@c ./../src/parse_y.y 353 @cartouche @format @@ -601,7 +601,7 @@ @c pcbfile Polygon @node Polygon syntax @subsection Polygon -@c ./../src/parse_y.y 733 +@c ./../src/parse_y.y 743 @cartouche @format @@ -629,7 +629,7 @@ @c pcbfile Rat @node Rat syntax @subsection Rat -@c ./../src/parse_y.y 550 +@c ./../src/parse_y.y 558 @cartouche @format @@ -652,7 +652,7 @@ @c pcbfile Styles @node Styles syntax @subsection Styles -@c ./../src/parse_y.y 435 +@c ./../src/parse_y.y 442 @cartouche @format @@ -695,7 +695,7 @@ @c pcbfile Symbol @node Symbol syntax @subsection Symbol -@c ./../src/parse_y.y 1138 +@c ./../src/parse_y.y 1148 @cartouche @format @@ -717,7 +717,7 @@ @c pcbfile SymbolLine @node SymbolLine syntax @subsection SymbolLine -@c ./../src/parse_y.y 1193 +@c ./../src/parse_y.y 1197 @cartouche @format @@ -736,7 +736,7 @@ @c pcbfile Text @node Text syntax @subsection Text -@c ./../src/parse_y.y 679 +@c ./../src/parse_y.y 689 @cartouche @format @@ -767,7 +767,7 @@ @c pcbfile Thermal @node Thermal syntax @subsection Thermal -@c ./../src/parse_y.y 358 +@c ./../src/parse_y.y 365 @cartouche @format @@ -786,7 +786,7 @@ @c pcbfile Via @node Via syntax @subsection Via -@c ./../src/parse_y.y 491 +@c ./../src/parse_y.y 498 @cartouche @format @@ -818,7 +818,7 @@ @end table @c pcbfile ~objectflags -@c ./../src/const.h 101 +@c ./../src/const.h 110 @node Object Flags @section Object Flags @@ -892,7 +892,7 @@ pad. Primarily used for pads used as fiducials. @end table @c pcbfile ~pcbflags -@c ./../src/const.h 140 +@c ./../src/const.h 149 @node PCBFlags @section PCBFlags @table @code diff -Nru pcb-20100929/doc/pcb.html pcb-20110918/doc/pcb.html --- pcb-20100929/doc/pcb.html 2010-09-29 20:55:25.000000000 +0000 +++ pcb-20110918/doc/pcb.html 2011-09-18 20:09:05.000000000 +0000 @@ -189,8 +189,8 @@ Boerge Strand (borges@ifi.uio.no) Andre M. Hedrick (hedrick@Astro.Dyer.Vanderbilt.Edu) -


who provided all sorts of help including porting Pcb to
- several operating systems and platforms, bug fixes, library enhancement, +

who provided all sorts of help including porting Pcb to +several operating systems and platforms, bug fixes, library enhancement, user interface suggestions and more. In addition to these people, many others donated time for bug-fixing and other important work. Some of them can be identified in the source code @@ -554,10 +554,7 @@ Btn3, but don't use Btn2. The undo function (U key or ‘undo last operation’ from the Edit menu) will take you back -point by point if you use it while in the line mode. If you drag -the pointer out of the Layout area while drawing a line, the -display will auto-scroll (assuming sufficient zoom for scrolling). -To stop auto-scroll, simply pass the pointer over the panner control. +point by point if you use it while in the line mode.

New lines can be restricted to 45 degree angles if desired. You can toggle this restriction on and off while creating lines by pressing the period key. @@ -769,8 +766,8 @@ 

         can't find default font-symbol-file 'default_font'
-


then the font searchpath or filename in the application resource
- file is wrong. Be sure that your m4 program supports search paths. +

then the font searchpath or filename in the application resource +file is wrong. Be sure that your m4 program supports search paths. If not, get GNU m4. For other messages, see problems. Another quick-start is provided by pcbtest.sh in the src @@ -786,7 +783,8 @@

  • Moving and Copying
  • Loading and Saving
  • Printing: Creating Gerber files or postscript files -
  • Arrow Tool: Selecting/Moving objects. +
  • Exporting: Exporting a layout. +
  • Arrow Tool: Selecting/Moving objects.
  • Rats Nest: Helps you place and route tracks against a netlist.
  • Design Rule Checking: Check for manufactureability
  • Trace Optimizer: Optimization of layouts @@ -806,19 +804,17 @@

    3.1 The Application Window

    -

    The main window consists of six areas: -the menu at the top, the panner control in the upper left corner, the layer -controls located below the panner, the tool buttons +

    The main window consists of five areas: +the menu at the top, the layer control in the upper left, the tool buttons located below the layer controls, the Layout area to the right of these, and the status line at the bottom of the window.

    @@ -993,7 +989,7 @@

    -Next: , +Next: , Previous: Menu, Up: Application Window @@ -1055,71 +1051,18 @@ Pressing Ctrl-M again turns the marker off.
    - -

    -Next: , -Previous: Status-line and Input-field, -Up: Application Window - -
    - -

    3.1.3 The Panner Control

    - -

    -The panner control, located at the upper left side of the window, is used to -adjust what portion of the layout is seen in the Layout area. The outer -rectangle of the panner represents the whole layout (extended to have the -panner aspect ratio), while the inner control rectangle represents the -portion seen through the Layout area. Slowly drag this part around with -the mouse (Btn1) to see how it pans the layout. Release the panner -control, but leave the pointer within the outer most rectangle of the -control. Now hit a few keyboard arrow keys. Each arrow key moves the region -seen one-half window size in the arrow direction. If you want to see a -portion of the layout that is off the top of the screen, you need to -drag the panner up, or hit the up arrow key. - -

    Move the pointer back into the Layout area. -Increase the zoom by hitting the Z key. See how the inner part of -the panner becomes smaller to reflect that you are viewing a smaller -part of the layout. Now zoom out by hitting Shift-Z. If you -hit the arrow key with the pointer in the Layout area, it moves -the pointer rather than scrolling the window. In general the keyboard -shortcuts depend on which region of Pcb's window the pointer -is over. For the most part, the key strokes in this manual refer to -the case when the pointer is in the Layout area. You can do fine -scrolling in the Layout area by dragging it directly with the -Panner tool. Press the Escape key to select the panner tool. -Now drag in the layout area with Btn1 down. You can scroll the drawing -window while the pointer is inside it with Mod-Arrow -keys. - -

    If you are moving or drawing an object and go beyond the drawing -window borders, the window will auto-scroll. If you want to stop -the auto-scrolling while the pointer is outside the Layout area, -simply pass the pointer briefly over the panner control area, or -a menu button. - -

    Another way to navigate around a layout is with Shift-Btn3. -When pressed down, the layout will zoom so the whole extent of -objects is visible, and will return to the previous zoom when -you release the button, but will be centered at the cross hair -position where the button is released. You can do this while in -the middle of drawing an object. Try it now to center near -U7. - -

    Next: , -Previous: Panner Control, +Previous: Status-line and Input-field, Up: Application Window
    -

    3.1.4 The Layer Controls

    +

    3.1.3 The Layer Controls

    -

    -The layer control panel, located below the panner control, is used to turn on +

    +The layer control panel, located in the upper left, is used to turn on and off the display of layer groups and to select the active drawing layer. If a layer hasn't been named, the label "(unknown)" is used as the default. If this happens, it probably means the application resources are not installed @@ -1136,8 +1079,9 @@ the actual board. Notice that this example has 2 groups each having 3 layers, plus two other layers named ‘unused’. Use the ‘Edit layer groups’ option in the ‘Settings’ menu to -change the layer groupings. Note that changing the groupings can -radically alter the connectivity on the board. +change the layer groupings in the lesstif GUI or the ‘Preferences’ +dialog from the ‘File’ menu in the GTK+ GUI. Note that changing the +groupings can radically alter the connectivity on the board. Grouping layers is only useful for helping you to color-code signals in your layout. Note that grouping layers actually reduces the number of different physical layers available for your board, so to make an eight @@ -1188,17 +1132,16 @@

    -

    3.1.5 The Tool Selectors

    +

    3.1.4 The Tool Selectors

    -

    +

    The tool selector buttons reside below the layer controls. They are used to select which layout tool to use in the drawing area. Each tool performs its function when Btn1 is pressed. Every tool gives the cursor a unique shape that identifies it. The tool selector buttons themselves are icons that illustrate their function. Each layout tool can also be selected from the keyboard: -

             Escape key   Panner tool
-         F1 key       Via tool
+
             F1 key       Via tool
          F2 key       Line tool
          F3 key       Arc tool
          F4 key       Text tool
@@ -1318,9 +1261,9 @@
 
 
 
-
    3.1.6 Layout Area
    
+
    3.1.5 Layout Area
    
 
-
    
+
    
 The layout area is where you see the layout. The cursor shape depends
 on the active tool when the pointer is moved into the layout area. 
 A cross hair follows the mouse pointer with respect to the grid setting. 
@@ -1345,7 +1288,7 @@
 
 
    3.2 Log Window
    
 
-
    
+
    
 This optional window is used to display all kind of messages including
 the ones written to stderr by external commands. The main advantage
 of using it is
@@ -1370,7 +1313,7 @@
 
 
    3.3 Library Window
    
 
-
    
+
    
 The library window makes loading elements (or even partial layouts) easy. 
 Just click the appropriate library from the list on the left. A list
 of its elements then appears on the right. Select an element
@@ -1401,7 +1344,7 @@
 
 
    3.4 Netlist Window
    
 
-
    
+
    
 The netlist window is very similar to the library window. On the left
 is a list of all of the nets, on the right is the list of connections
 belonging to the chosen net. The chosen net is highlighted in the
@@ -1439,7 +1382,7 @@
 
 
    3.5 Drawing and Removing Basic Objects
    
 
-
    
+
    
 hace begging gutting here, and do a real-world tutorial example.
 
    
    There are several ways of creating new objects: you can draw them yourself,
@@ -1492,7 +1435,7 @@
 
 
    3.5.1 Common Drawing and Removing Methods
    
 
-
    
+
    
 There are several keystrokes and button events referring to an object
 without identifying its type. Here's a list of them:
 
@@ -1541,7 +1484,7 @@
 
 
    3.5.2 Lines
    
 
-
    
+
    
 To draw new lines you have to be in line-mode. Get there either by
 selecting it from the Tool palette or by pressing <Key>F2. 
 Each successive notify event creates a new line. The
@@ -1576,7 +1519,7 @@
 
 
    3.5.3 Arcs
    
 
-
    
+
    
 An Arc is drawn  with the arc-tool. Get there either by selecting it
 from the Tool palette or by pressing <Key>F8. Press Btn1 to
 define the starting point for the arc.  Drag the mouse towards the desired
@@ -1604,7 +1547,7 @@
 
 
    3.5.4 Polygons and Rectangles
    
 
-
    
+
    
 A polygon is drawn by defining all of its segments as a series of
 consecutive line segments. If the first point matches a new one and if
 the number of points is greater than two, then the polygon is closed. 
@@ -1645,7 +1588,7 @@
 
 
    3.5.5 Text
    
 
-
    
+
    
 Pressing <Key>F5 or clicking one of the text selector buttons
 changes to text-mode. 
 Each successive notify event (<Btn1>)
@@ -1679,7 +1622,7 @@
 
 
    3.5.6 Vias
    
 
-
    
+
    
 The initial size of new vias may be changed by <Key>v and
 Shift<Key>v or by selecting the appropriate entry from the
 Sizes menu. Mod1<Key>v and Mod1 Shift<Key>v do
@@ -1712,7 +1655,7 @@
 
 
    3.5.7 Elements
    
 
-
    
+
    
 Some of the functions related to elements only work if both the package
 layer and the pin layer are switched on.
 
@@ -1728,7 +1671,7 @@
    
    We don't have any elements on the screen yet nor anything in the
 buffer, so we use number one.
 
-   
    Select lsi from the menu in the library window press
+   
    Select lsi from the menu in the library window press
 <Btn1> twice at the appropriate text-line to get
 the MC68030 CPU. 
 The data is loaded and the mode is switched to pastebuffer-mode. 
@@ -1754,7 +1697,7 @@
 If you have problems with the color of the cross hair, change the resource
 cross hairColor setting to a different one.
 
-   
    Now load a second circuit, the MC68882 FPU for example. 
+   
    Now load a second circuit, the MC68882 FPU for example. 
 Create the circuit as explained above. You now have two different unnamed
 elements. Unnamed means that the layout-name of the element
 hasn't been set yet. Selecting description from the Display
@@ -1773,7 +1716,7 @@
    
    The third way to create a new element is to copy an existing one. 
 Please refer to Moving and Copying.
 
-   
    The fourth way to create a new element is to convert a buffer's contents
+   
    The fourth way to create a new element is to convert a buffer's contents
 into an element.  Here's how it's done: Select the Via-tool from the
 Tool pallet.  Set the grid spacing to something appropriate for
 the element pin spacing.  Now create a series of vias where the pins
@@ -1825,7 +1768,7 @@
 
 
    3.5.8 Pastebuffer
    
 
-
    
+
    
 The line-stack and element-buffer of former releases have been replaced
 by 5 (possibly more or less if changed at compile time
 with the MAX_BUFFER variable in globalconfig.h)
@@ -1867,7 +1810,7 @@
 
 
    3.6 Moving and Copying
    
 
-
    
+
    
 All objects can be moved including element-names, by
 <Btn2Down>, dragging the pointer while holding the button down
 and releasing it at the new location of the object. If you use
@@ -1883,7 +1826,7 @@
 desired position.  Remember that all movements are forced onto grid coordinates, so
 you may want to change the grid spacing first.
 
-   
    To move a trace or group of traces to a different layer, first select
+   
    To move a trace or group of traces to a different layer, first select
 the tracks to be moved.  It's easiest to do this if you shut off everything
 but that layer first (i.e. silk, pins, other layers, etc). 
 Now set the current layer to be the new layer. 
@@ -1901,7 +1844,7 @@
 
 
    3.7 Loading and Saving
    
 
-
    
+
    
 After your first experience with Pcb you will probably want to save
 your work. :s name passes the data to an external program which
 is responsible for saving it. For details see saveCommand in
@@ -1915,7 +1858,7 @@
 don't specify a filename. Merging existing layouts into the new one is
 supported either by the File menu or by :m filename.
 
-   
    Pcb saves a backup of the current layout at a user specified interval. 
+   
    Pcb saves a backup of the current layout at a user specified interval. 
 The backup filename is created by appending a dash, "-", to the .pcb filename. 
 For example, if you are editing the layout in projects/board.pcb then the
 backup file name will be projects/board.pcb-.  If the layout is new and
@@ -1931,7 +1874,7 @@
 
    
 
 
    
-Next: ,
+Next: ,
 Previous: Loading and Saving,
 Up: Getting Started
 
@@ -1939,7 +1882,7 @@
 
 
    3.8 Printing
    
 
-
    
+
    
 Pcb now has support for device drivers,
 PostScript, encapsulated PostScript,
 and Gerber RS-274X drivers are
@@ -1961,19 +1904,19 @@
 (you'd get an incorrectly made board!)  The options are:
 
      
-
-
+
+
 
    ‘device’
    The top menu button selects from the available device drivers.
 
-     

    ‘rotate’
    Rotate layout 90 degrees counter-clockwise before printing (default).
+     

    ‘rotate’
    Rotate layout 90 degrees counter-clockwise before printing (default).
 
-     

    ‘mirror’
    Mirror layout before printing. Use this option depending
+     

    ‘mirror’
    Mirror layout before printing. Use this option depending
 on your production line.
 
-     

    ‘color’
    Created colored output. All colors will be converted to black if this option
+     

    ‘color’
    Created colored output. All colors will be converted to black if this option
 is inactive.
 
-     

    ‘outline’
    Add a board outline to the output file. The size is determined by the
+     

    ‘outline’
    Add a board outline to the output file. The size is determined by the
 maximum board size changeable from the sizes menu. The outline appears
 on the top and bottom sides of the board, but not on the internal layers. 
 An outline can be useful for determining where to shear the board from the
@@ -1982,16 +1925,16 @@
 to the board edge.  Use a viewer to see what the output outline looks like
 if you want to know what it looks like.
 
-     

    ‘alignment’
    Additional alignment targets are added to the output. The distances between
+     

    ‘alignment’
    Additional alignment targets are added to the output. The distances between
 the board outline is set by the resource alignmentDistance.  Alignment
 targets should only be used if you know for certain that YOU WILL BE USING
 THEM YOURSELF.  It is extremely unlikely that you will want to have alignment
 targets if you send gerber files to a commercial pcb manufacture to be made.
 
-     

    ‘scaling’
    It's quite useful to enlarge your printout for checking the layout. 
+     

    ‘scaling’
    It's quite useful to enlarge your printout for checking the layout. 
 Use the scrollbar to adjust the scaling factor to your needs.
 
-     

    ‘media’
    Select the size of the output media from this menu. The user defined size
+     

    ‘media’
    Select the size of the output media from this menu. The user defined size
 may be set by the resource media either from one of the well known
 paper sizes or by a X11 geometry specification. 
 This entry is only available if you use X11R5 or later. 
@@ -2007,15 +1950,15 @@
           	legal
           	executive
 
    
-     

    ‘offset’
    Adjust the offsets of the printout by using the panner at the right side
+     

    ‘offset’
    Adjust the offsets of the printout by using the panner at the right side
 of the dialog box. 
 This entry is only available if you use X11R5 or later. A zero
 offset is used for earlier releases.
 
-     

    ‘8.3 filenames’
    Select this button to generate DOS compatible filenames for the output files. 
+     

    ‘8.3 filenames’
    Select this button to generate DOS compatible filenames for the output files. 
 The command input area will disappear if selected.
 
-     

    ‘commandline’
    Use this line to enter a command (starts with |) or a filename. 
+     

    ‘commandline’
    Use this line to enter a command (starts with |) or a filename. 
 A %f is replaced by the current filename. 
 The default is set by the resource printCommand.
 
@@ -2038,6 +1981,191 @@
 
 
 
    
+
+
    
+Next: ,
+Previous: Printing,
+Up: Getting Started
+
+
    
+
+
    3.9 Exporting a layout
    
+
+
    
+To export a layout choose Export layout from the File menu, then
+select the desired exporter.
+
+
    
+
+
    
+
+
    
+Next: ,
+Up: Exporting
+
+
    
+
+
    3.9.1 Bill of materials (bom)
    
+
+
    
+Produces a bill of materials (BOM) file and a centroid (XY) file.
+
+
    
+
+
    
+Next: ,
+Previous: bom,
+Up: Exporting
+
+
    
+
+
    3.9.2 G-code (gcode)
    
+
+
    
+The gcode exporter can generate RS274/NGC G-CODE files to be used with a CNC mill to
+produce pcb's by mechanically removing copper from the perimeter of all elements.
+
+   
    The elements are enlarged in order to compensate for the cutting tool size so
+that the remaining copper corresponds to the original size; however all
+polygons are left unchanged and will end up being a little smaller; this is not a
+problem because the electrical connection is done with traces, which are correctly
+enlarged.
+
+   
    A .cnc file is generated for every copper layer, with the bottom layer mirrored so
+that the milling is done right; of course it's not possible to produce directly
+multi-layer (more than 2) pcb's with this method, but the cnc files for
+intermediate layers are generated anyways.
+
+   
    A drill file is also generated, and it contains all drills regardless of the hole
+size; the drilling sequence is optimized in order to require the least amount of
+movement.
+
+   
    The export function generates an intermediate raster image before extracting the contour
+of copper elements, and this image is saved as well (in .png format) for inspection.
+
+   
    When the spacing between two elements is less than the tool diameter they will merge
+and no isolation will be cut between them; the control image should be checked for
+this behaviour.
+
+   
    Possible workarounds are: increasing spacing, decreasing the tool size, increasing
+the intermediate image resolution.
+
+   
    To maximize the chance of producing correct pcb's it would be better to increase
+the DRC clearance to at least the tool diameter and use traces as thick as possible;
+the rule is: use the largest element that will not prevent the isolation cut.
+
+   
    The exporter parameters are:
+
+     
    
+
    basename
    base name for generated files
+
+     
    dpi
    intermediate image resolution; affects precision when extracting contours
+
+     
    mill depth
    should be the copper depth
+
+     
    safe z
    Z value when moving between polygons
+
+     
    tool radius
    copper elements are enlarged by this amount
+
+     
    drill depth
    depth of drills
+
+     
    measurement unit
    for all parameters above, can be mm,um,inch,mil; g-code is always mm or inch
+
    
+
+   
    All .cnc files specify Z values as parameters, so that it's easy to
+change them without the need to run the exporter again.
+
+   
    Operation was verified with the EMC2 g-code interpreter.
+
+   
    Following is a sample layout that is converted with default settings:
+
    Sample Layout
    
+
+
    The control image shows that the spacing is sufficient:
+
    Control Image
    
+
+
    The final tool path follows the perimeter of all elements:
+
    Resulting Tool Path
    
+
+
    
+
+
    
+Next: ,
+Previous: gcode,
+Up: Exporting
+
+
    
+
+
    3.9.3 Gerber (gerber)
    
+
+
    
+Produces RS274-X (a.k.a. gerber) photo plot files and Excellon drill files.
+
+
    
+
+
    
+Next: ,
+Previous: gerber,
+Up: Exporting
+
+
    
+
+
    3.9.4 Nelma (nelma)
    
+
+
    
+Numerical analysis package export.
+
+
    
+
+
    
+Next: ,
+Previous: nelma,
+Up: Exporting
+
+
    
+
+
    3.9.5 Image (png)
    
+
+
    
+Produces GIF/JPEG/PNG image files.
+
+
    
+
+
    
+Next: ,
+Previous: png,
+Up: Exporting
+
+
    
+
+
    3.9.6 Postscript (ps)
    
+
+
    
+Export as postscript. 
+Can be later converted to pdf.
+
+
    
+
+
    
+Previous: ps,
+Up: Exporting
+
+
    
+
+
    3.9.7 Encapsulated Postscript (eps)
    
+
+
    
+Export as eps (encapsulated postscript) for inclusion in other documents. 
+Can be later converted to pdf.
+
+
    
 
 
    
 Previous: Vendor drill mapping,
@@ -2045,9 +2173,9 @@
 
 
    
 
-
    3.9 Connection Lists
    
+
    3.10 Connection Lists
    
 
-
    
+
    
 After completing parts of your layout you may want to check if all drawn
 connections match the ones you have in mind. This is probably best done
 in conjunction with a net-list file: see Rats Nest. 
@@ -2086,14 +2214,14 @@
 
 
    
 Next: ,
-Previous: Printing,
+Previous: Exporting,
 Up: Getting Started
 
 
 
-
    3.10 Arrow Tool
    
+
    3.11 Arrow Tool
    
 
-
    
+
    
 Some commands mentioned earlier in this chapter also are able to operate on all
 selected and visible objects. The Arrow tool is used to select/deselect
 objects and also to move objects or selections.  If you click and release
@@ -2139,9 +2267,9 @@
 
 
 
-
    3.11 Rats Nest
    
+
    3.12 Rats Nest
    
 
-
    
+
    
 If you have a netlist that corresponds to the layout you are working on, you
 can use the rats-nest feature to add rat-lines to the layout. 
 First you will need to load a netlist file (see :rn,
@@ -2154,7 +2282,7 @@
 get a message that the wiring is complete.
 
    
    Rat-lines are lines having the special property that they only connect to pins and
-pads at their end points.  Rat-lines are drawn on the screen with a stippled pattern
+pads at their end points.  Rat-lines may be drawn differently to other lines
 to make them easier to identify since they have special behavior and cannot
 remain in a completed layout. 
 Rat-lines are added in the minimum length straight-line tree pattern
@@ -2229,9 +2357,9 @@
 
 
 
-
    3.12 Design Rule Checking
    
+
    3.13 Design Rule Checking
    
 
-
    
+
    
 After you've finished laying out a board, you may want to check
 to be certain that none of your interconnections are too closely
 spaced or too tenuously touching to be reliably fabricated. The design
@@ -2274,9 +2402,9 @@
 
 
 
-
    3.13 Trace Optimizer
    
+
    3.14 Trace Optimizer
    
 
-
    
+
    
 PCB includes a flexible trace optimizer.  The trace optimizer can be run
 after auto routing or hand routing to clean up the traces.
 
@@ -2319,9 +2447,9 @@
 
 
 
-
    3.14 Searching for elements
    
+
    3.15 Searching for elements
    
 
-
    
+
    
 To locate text or a specific element or grouping of similar elements
 choose ‘Select by name’ from the Select menu, then choose the
 appropriate subsection.  At the bottom of the screen the prompt
@@ -2337,9 +2465,9 @@
 
 
 
-
    3.15 Measuring distances
    
+
    3.16 Measuring distances
    
 
-
    
+
    
 To measure distances, for example the pin-to-pin pitch of a part to
 validate a footprint, place the cursor at the starting
 measurement point, then press !Ctrl<Key>m.  This marks the
@@ -2359,9 +2487,9 @@
 
 
 
-
    3.16 Vendor Drill Mapping
    
+
    3.17 Vendor Drill Mapping
    
 
-
    
+
    
 Pcb includes support for mapping drill holes to a specified set
 of sizes used by a particular vendor.  Many PCB manufacturers have a
 prefered set of drill sizes and charge extra when others are used. 
@@ -2457,7 +2585,7 @@
 
 
    4 Autorouter
    
 
-
    
+
    
 Pcb includes an autorouter which can greatly speed up the
 layout of a circuit board.  The autorouter is a rectangle-expansion
 type of autorouter based on
@@ -2542,7 +2670,7 @@
 
 
    5 User Commands
    
 
-
    The entering of user-commands is initiated by the action routine
+
    The entering of user-commands is initiated by the action routine
 Command() (normally bound to the (":") character) which
 replaces the bottom statusline with an input area or opens a separate
 command window.  It is finished by either <Key>Return or
@@ -2573,226 +2701,994 @@
 complete set of commands.
 
      
-
-
-
+
+
+
 
    ‘l [filename]’
    Loads a new datafile (layout) and, if confirmed, overwrites any existing unsaved data. 
 The filename and the searchpath (filePath) are passed to the
 command defined by fileCommand. 
 If no filename is specified a file select box will popup.
 
-     

    ‘le [filename]’
    Loads an element description into the paste buffer. 
+     

    ‘le [filename]’
    Loads an element description into the paste buffer. 
 The filename and the searchpath (elementPath) are passed to the
 command defined by elementCommand. 
 If no filename is specified a file select box will popup.
 
-     

    ‘m [filename]’
    Loads an layout file into the paste buffer. 
+     

    ‘m [filename]’
    Loads an layout file into the paste buffer. 
 The filename and the searchpath (filePath) are passed to the
 command defined by fileCommand. 
 If no filename is specified a file select box will popup.
 
-     

    ‘q[!]’
    Quits the program without saving any data (after confirmation). 
+     

    ‘q[!]’
    Quits the program without saving any data (after confirmation). 
 q! doesn't ask for confirmation, it just quits.
 
-     

    ‘s [filename]’
    Data and the filename are passed to the command defined by the resource
-saveCommand. It must read the layout data from stdin. 
-If no filename is entered, either the last one is used
-again or, if it is not available, a file select box will pop up.
+     

    ‘s [filename]’
    Data and the filename are passed to the command defined by the resource
+saveCommand. It must read the layout data from stdin. 
+If no filename is entered, either the last one is used
+again or, if it is not available, a file select box will pop up.
+
+     

    ‘rn [filename]’
    Reads in a netlist file.  If no filename is given
+a file select box will pop up. 
+The file is read via the command defined by the
+RatCommand resource. The command must send its output to stdout.
+
+     
    Netlists are used for generating rat's nests (see Rats Nest) and for
+verifying the board layout (which is also accomplished by the Ratsnest
+command).
+
+     

    ‘w[q] [filename]’
    These commands have been added for the convenience of vi users and
+have the same functionality as s combined with q.
+
+     

    ‘actionCommand’
    Causes the actionCommand to be executed.  This allows you to initiate actions
+for which no bindings exist in the resource file.  It can be used to initiate any
+action with whatever arguments you enter.  This makes it possible to do things
+that otherwise would be extremely tedious.  For example, to change the drilling
+hole diameter of all vias in the layout to 32 mils, you could select everything using the
+selection menu, then type ":ChangeDrillSize(SelectedVias, 32)".  (This will
+only work provided the via's diameter is sufficiently large to accommodate a 32 mil hole). 
+Another example might be to set the grid to 1 mil by typing ":SetValue(Grid, 1)". 
+Note that some actions use the current cursor location, so be sure to place the cursor
+where you want before entering the command.  This is one of my favorite new
+features in 1.5 and can be a powerful tool. Study the Actions section to
+see what actions are available.
+
+   
    
+
+
+
    
+
+
+
    
+Next: ,
+Previous: User Commands,
+Up: Top
+
+
    
+
+
    6 Command-Line Options
    
+
+
    
+The synopsis of the pcb command is:
+
+   
    pcb [OPTION ...] [LAYOUT-FILE.pcb] to start the application in GUI mode,
+
+
    or
+
+   
    pcb [-h | -V | --copyright] for a list of options, version, and copyright,
+
+
    or
+
+   
    pcb -p [OPTION ...] [LAYOUT-FILE.pcb] to print a layout,
+
+
    or
+
+   
    pcb -x HID [OPTION ...] [LAYOUT-FILE.pcb] to export.
+
+
    Possible values for the parameter ‘HID’ are:
+     
    
+   
    ‘bom’
        Export a bill of materials
+   
    ‘gcode’
        Export to G-Code
+   
    ‘gerber’
        Export RS-274X (Gerber)
+   
    ‘nelma’
        Numerical analysis package export
+   
    ‘png’
        export GIF/JPEG/PNG
+   
    ‘ps’
        export postscript
+   
    ‘eps’
        export encapsulated postscript
+
    
+
+
    There are several resources which may be set or reset in addition to the
+standard toolkit command-line options. For a complete list refer to
+Resources.
+
+
+
    
+
+
    
+
+
    
+Next: ,
+Up: Command-Line Options
+
+
    
+
+
    6.1 General Options
    
+
+
+     
    
+
    --help
    Show help on command line options. 
+
    
+
+     
    
+
    --version
    Show version. 
+
    
+   
+     
    
+
    --verbose
    Be verbose on stdout. 
+
    
+   
+     
    
+
    --copyright
    Show copyright. 
+
    
+   
+     
    
+
    --show-defaults
    Show option defaults. 
+
    
+   
+     
    
+
    --show-actions
    Show available actions and exit. 
+
    
+   
+     
    
+
    --dump-actions
    Dump actions (for documentation). 
+
    
+   
+     
    
+
    --grid-units-mm <string>
    Set default grid units. Can be mm or mil. Defaults to mil. 
+
    
+   
+     
    
+
    --backup-interval
    Time between automatic backups in seconds. Set to 0 to disable. 
+The default value is 60. 
+
    
+   
+     
    
+
    --groups <string>
    Layer group string. Defaults to "1,c:2:3:4:5:6,s:7:8". 
+
    
+   
+     
    
+
    --route-styles <string>
    A string that defines the route styles. Defaults to 
    
+"Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000
+	:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"
+
    
+   
+     
    
+
    --element-path <string>
    A colon separated list of directories or commands (starts with '|'). 
+The path is passed to the program specified in --element-command. 
+
    
+   
+     
    
+
    --action-script <string>
    If set, this file is executed at startup. 
+
    
+   
+     
    
+
    --action-string <string>
    If set, this string of actions is executed at startup. 
+
    
+   
+     
    
+
    --fab-author <string>
    Name of author to be put in the Gerber files. 
+
    
+   
+     
    
+
    --layer-stack <string>
    Initial layer stackup, for setting up an export. A comma separated list of layer
+names, layer numbers and layer groups. 
+
    
+   
+     
    
+
    --save-last-command
    If set, the last user command is saved. 
+
    
+   
+     
    
+
    --save-in-tmp
    If set, all data which would otherwise be lost are saved in a temporary file
+/tmp/PCB.%i.save . Sequence ‘%i’ is replaced by the process ID. 
+
    
+   
+     
    
+
    --reset-after-element
    If set, all found connections are reset before a new component is scanned. 
+
    
+   
+     
    
+
    --ring-bell-finished
    Execute the bell command when all rats are routed. 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: General Options,
+Up: Command-Line Options
+
+
    
+
+
    6.2 General GUI Options
    
+
+
+     
    
+
    --pinout-offset-x <num>
    Horizontal offset of the pin number display. Defaults to 100mil. 
+
    
+
+     
    
+
    --pinout-offset-y <num>
    Vertical offset of the pin number display. Defaults to 100mil. 
+
    
+   
+     
    
+
    --pinout-text-offset-x <num>
    Horizontal offset of the pin name display. Defaults to 800mil. 
+
    
+   
+     
    
+
    --pinout-text-offset-y <num>
    Vertical offset of the pin name display. Defaults to -100mil. 
+
    
+   
+     
    
+
    --draw-grid
    If set, draw the grid at start-up. 
+
    
+   
+     
    
+
    --clear-line
    If set, new lines clear polygons. 
+
    
+   
+     
    
+
    --full-poly
    If set, new polygons are full ones. 
+
    
+   
+     
    
+
    --unique-names
    If set, you will not be permitted to change the name of an component to match that
+of another component. 
+
    
+   
+     
    
+
    --snap-pin
    If set, pin centers and pad end points are treated as additional grid points
+that the cursor can snap to. 
+
    
+   
+     
    
+
    --all-direction-lines
    Allow all directions, when drawing new lines. 
+
    
+   
+     
    
+
    --show-number
    Pinout shows number. 
+
    
+   
+
    
+
+
+
    
+Next: ,
+Previous: General GUI Options,
+Up: Command-Line Options
+
+
    
+
+
    6.3 GTK+ GUI Options
    
+
+
+     
    
+
    --listen
    Listen for actions on stdin. 
+
    
+
+     
    
+
    --bg-image <string>
    File name of an image to put into the background of the GUI canvas. The image must
+be a color PPM image, in binary (not ASCII) format. It can be any size, and will be
+automatically scaled to fit the canvas. 
+
    
+   
+     
    
+
    --pcb-menu <string>
    Location of the gpcb-menu.res file which defines the menu for the GTK+ GUI. 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: GTK+ GUI Options,
+Up: Command-Line Options
+
+
    
+
+
    6.4 lesstif GUI Options
    
+
+
+     
    
+
    --listen
    Listen for actions on stdin. 
+
    
+
+     
    
+
    --bg-image <string>
    File name of an image to put into the background of the GUI canvas. The image must
+be a color PPM image, in binary (not ASCII) format. It can be any size, and will be
+automatically scaled to fit the canvas. 
+
    
+   
+     
    
+
    --pcb-menu <string>
    Location of the pcb-menu.res file which defines the menu for the lesstif GUI. 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: lesstif GUI Options,
+Up: Command-Line Options
+
+
    
+
+
    6.5 Colors
    
+
+
+     
    
+
    --black-color <string>
    Color value for black. Default: ‘#000000’
+
    
+
+     
    
+
    --black-color <string>
    Color value for white. Default: ‘#ffffff’
+
    
+   
+     
    
+
    --background-color <string>
    Background color of the canvas. Default: ‘#e5e5e5’
+
    
+   
+     
    
+
    --crosshair-color <string>
    Color of the crosshair. Default: ‘#ff0000’
+
    
+   
+     
    
+
    --cross-color <string>
    Color of the cross. Default: ‘#cdcd00’
+
    
+   
+     
    
+
    --via-color <string>
    Color of vias. Default: ‘#7f7f7f’
+
    
+   
+     
    
+
    --via-selected-color <string>
    Color of selected vias. Default: ‘#00ffff’
+
    
+   
+     
    
+
    --pin-color <string>
    Color of pins. Default: ‘#4d4d4d’
+
    
+   
+     
    
+
    --pin-selected-color <string>
    Color of selected pins. Default: ‘#00ffff’
+
    
+   
+     
    
+
    --pin-name-color <string>
    Color of pin names and pin numbers. Default: ‘#ff0000’
+
    
+   
+     
    
+
    --element-color <string>
    Color of components. Default: ‘#000000’
+
    
+   
+     
    
+
    --rat-color <string>
    Color of ratlines. Default: ‘#b8860b’
+
    
+   
+     
    
+
    --invisible-objects-color <string>
    Color of invisible objects. Default: ‘#cccccc’
+
    
+   
+     
    
+
    --invisible-mark-color <string>
    Color of invisible marks. Default: ‘#cccccc’
+
    
+   
+     
    
+
    --element-selected-color <string>
    Color of selected components. Default: ‘#00ffff’
+
    
+   
+     
    
+
    --rat-selected-color <string>
    Color of selected rats. Default: ‘#00ffff’
+
    
+   
+     
    
+
    --connected-color <string>
    Color to indicate connections. Default: ‘#00ff00’
+
    
+   
+     
    
+
    --off-limit-color <string>
    Color of off-canvas area. Default: ‘#cccccc’
+
    
+   
+     
    
+
    --grid-color <string>
    Color of the grid. Default: ‘#ff0000’
+
    
+   
+     
    
+
    --layer-color-<n> <string>
    Color of layer <n>, where <n> is an integer from 1 to 16. 
+
    
+   
+     
    
+
    --layer-selected-color-<n> <string>
    Color of layer <n>, when selected. <n> is an integer from 1 to 16. 
+
    
+   
+     
    
+
    --warn-color <string>
    Color of offending objects during DRC. Default value is "#ff8000"
+
    
+   
+     
    
+
    --mask-color <string>
    Color of the mask layer. Default value is "#ff0000"
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: Colors,
+Up: Command-Line Options
+
+
    
+
+
    6.6 Layer Names
    
+
+
+     
    
+
    --layer-name-1 <string>
    Name of the 1st Layer. Default is "top". 
+
    
+
+     
    
+
    --layer-name-2 <string>
    Name of the 2nd Layer. Default is "ground". 
+
    
+   
+     
    
+
    --layer-name-3 <string>
    Name of the 3nd Layer. Default is "signal2". 
+
    
+   
+     
    
+
    --layer-name-4 <string>
    Name of the 4rd Layer. Default is "signal3". 
+
    
+   
+     
    
+
    --layer-name-5 <string>
    Name of the 5rd Layer. Default is "power". 
+
    
+   
+     
    
+
    --layer-name-6 <string>
    Name of the 6rd Layer. Default is "bottom". 
+
    
+   
+     
    
+
    --layer-name-7 <string>
    Name of the 7rd Layer. Default is "outline". 
+
    
+   
+     
    
+
    --layer-name-8 <string>
    Name of the 8rd Layer. Default is "spare". 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: Layer Names,
+Up: Command-Line Options
+
+
    
+
+
    6.7 Paths
    
+
+
+     
    
+
    --lib-newlib <string>
    Top level directory for the newlib style library. 
+
    
+
+     
    
+
    --lib-name <string>
    The default filename for the library. 
+
    
+   
+     
    
+
    --default-font <string>
    The name of the default font. 
+
    
+   
+     
    
+
    --file-path <string>
    A colon separated list of directories or commands (starts with '|'). The path
+is passed to the program specified in --file-command together with the selected
+filename. 
+
    
+   
+     
    
+
    --font-path <string>
    A colon separated list of directories to search the default font. Defaults to
+the default library path. 
+
    
+   
+     
    
+
    --lib-path <string>
    A colon separated list of directories that will be passed to the commands specified
+by --element-command and --element-contents-command. 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: Paths,
+Up: Command-Line Options
+
+
    
 
-     

    ‘rn [filename]’
    Reads in a netlist file.  If no filename is given
-a file select box will pop up. 
-The file is read via the command defined by the
-RatCommand resource. The command must send its output to stdout.
+
    6.8 Sizes
    
 
-     
    Netlists are used for generating rat's nests (see Rats Nest) and for
-verifying the board layout (which is also accomplished by the Ratsnest
-command).
+
+
    All parameters should be given with an unit. If no unit is given, 1/100 mil
+(cmil) will be used. Write units without space to the
+number like 3mm, not 3 mm. 
+Valid Units are:
+     
    
+   
    ‘km’
        Kilometer
+   
    ‘m’
        Meter
+   
    ‘cm’
        Centimeter
+   
    ‘mm’
        Millimeter
+   
    ‘um’
        Micrometer
+   
    ‘nm’
        Nanometer
+   
    ‘in’
        Inch (1in = 0.0254m)
+   
    ‘mil’
        Mil (1000mil = 1in)
+   
    ‘cmil’
        Centimil (1/100 mil)
+
    
 
-     

    ‘w[q] [filename]’
    These commands have been added for the convenience of vi users and
-have the same functionality as s combined with q.
+     
    
+
    --via-thickness <num>
    Default diameter of vias. Default value is 60mil. 
+
    
+   
+     
    
+
    --via-drilling-hole <num>
    Default diameter of holes. Default value is 28mil. 
+
    
+   
+     
    
+
    --line-thickness <num>
    Default thickness of new lines. Default value is 10mil. 
+
    
+   
+     
    
+
    --rat-thickness <num>
    Thickness of rats. Values from 1 to 19 are fixed width in screen pixels. 
+Anything larger means PCB units (i.e. 100 means "1 mil"). Default value
+is 10mil. 
+
    
+   
+     
    
+
    --keepaway <num>
    Default minimum distance between a track and adjacent copper. 
+Default value is 10mil. 
+
    
+   
+     
    
+
    --default-PCB-width <num>
    Default width of the canvas. Default value is 6000mil. 
+
    
+   
+     
    
+
    --default-PCB-height <num>
    Default height of the canvas. Default value is 5000mil. 
+
    
+   
+     
    
+
    --text-scale <num>
    Default text scale. This value is in percent. Default value is 100. 
+
    
+   
+     
    
+
    --alignment-distance <num>
    Specifies the distance between the board outline and alignment targets. 
+Default value is 2mil. 
+
    
+   
+     
    
+
    --grid <num>
    Initial grid size. Default value is 10mil. 
+
    
+   
+     
    
+
    --minimum polygon area <num>
    Minimum polygon area. 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: Sizes,
+Up: Command-Line Options
 
-     

    ‘actionCommand’
    Causes the actionCommand to be executed.  This allows you to initiate actions
-for which no bindings exist in the resource file.  It can be used to initiate any
-action with whatever arguments you enter.  This makes it possible to do things
-that otherwise would be extremely tedious.  For example, to change the drilling
-hole diameter of all vias in the layout to 32 mils, you could select everything using the
-selection menu, then type ":ChangeDrillSize(SelectedVias, 32)".  (This will
-only work provided the via's diameter is sufficiently large to accommodate a 32 mil hole). 
-Another example might be to set the grid to 1 mil by typing ":SetValue(Grid, 1)". 
-Note that some actions use the current cursor location, so be sure to place the cursor
-where you want before entering the command.  This is one of my favorite new
-features in 1.5 and can be a powerful tool. Study the Actions section to
-see what actions are available.
+
 
-   
+
    6.9 Commands
    
 
-
+
+
    pcb uses external commands for input output operations. These commands can be
+configured at start-up to meet local requirements. The command string may include
+special sequences %f, %p or %a. These are replaced when the
+command is called. The sequence %f is replaced by the file name,
+%p gets the path and %a indicates a package name. 
+
+     
    
+
    --font-command <string>
    Command to load a font. 
+
    
+   
+     
    
+
    --file-command <string>
    Command to read a file. 
+
    
+   
+     
    
+
    --element-command <string>
    Command to read a footprint. 
    
+Defaults to "M4PATH='%p';export M4PATH;echo 'include(%f)' | m4"
+
    
+   
+     
    
+
    --print-file <string>
    Command to print to a file. 
+
    
+   
+     
    
+
    --lib-command-dir <string>
    Path to the command that queries the library. 
+
    
+   
+     
    
+
    --lib-command <string>
    Command to query the library. 
    
+Defaults to "QueryLibrary.sh '%p' '%f' %a"
+
    
+   
+     
    
+
    --lib-contents-command <string>
    Command to query the contents of the library. 
    
+Defaults to "ListLibraryContents.sh %p %f" or,
+on Windows builds, an empty string (to disable this feature). 
+
    
+   
+     
    
+
    --save-command <string>
    Command to save to a file. 
+
    
+   
+     
    
+
    --rat-command <string>
    Command for reading a netlist. Sequence %f is replaced by the netlist filename. 
+
    
+   
 
    
-
-
+
 
    
-Next: ,
-Previous: User Commands,
-Up: Top
+Next: ,
+Previous: Commands,
+Up: Command-Line Options
 
 
    
 
-
    6 Command-Line Options
    
+
    6.10 DRC Options
    
 
-
    
-There are several resources which may be set or reset in addition to the
-standard toolkit command-line options. For a complete list refer to
-Resources.
+
+
    All parameters should be given with an unit. If no unit is given, 1/100 mil
+(cmil) will be used for backward compability. Valid units are given in section
+Sizes. 
+
+     
    
+
    --bloat <num>
    Minimum spacing. Default value is 10mil. 
+
    
+   
+     
    
+
    --shrink <num>
    Minimum touching overlap. Default value is 10mil. 
+
    
+   
+     
    
+
    --min-width <num>
    Minimum width of copper. Default value is 10mil. 
+
    
+   
+     
    
+
    --min-silk <num>
    Minimum width of lines in silk. Default value is 10mil. 
+
    
+   
+     
    
+
    --min-drill <num>
    Minimum diameter of holes. Default value is 15mil. 
+
    
+   
+     
    
+
    --min-ring <num>
    Minimum width of annular ring. Default value is 10mil. 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: DRC Options,
+Up: Command-Line Options
 
-   
    The synopsis is:
+
    
 
-   
    pcb [-option ...] [-toolkit_option ...] [layout-file]
+
    6.11 BOM Creation
    
 
-   
    or
+
+     
    
+
    --bomfile <string>
    Name of the BOM output file. 
+
    
+
+     
    
+
    --xyfile <string>
    Name of the XY output file. 
+
    
+   
+     
    
+
    --xy-unit <unit>
    Unit of XY dimensions. Defaults to mil. 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: BOM Creation,
+Up: Command-Line Options
 
-   
    pcb -specialoption
+
    
 
-
+
    6.12 Gerber Export
    
 
+
+     
    
+
    --gerberfile <string>
    Gerber output file prefix. Can include a path. 
+
    
+
+     
    
+
    --all-layers
    Output contains all layers, even empty ones. 
+
    
+   
+     
    
+
    --verbose
    Print file names and aperture counts on stdout. 
+
    
+   
 
    
-
+
 
    
-Next: ,
+Next: ,
+Previous: Gerber Export,
 Up: Command-Line Options
 
 
    
 
-
    6.1 Options
    
+
    6.13 Postscript Export
    
 
+
+     
    
+
    --psfile <string>
    Name of the postscript output file. Can contain a path. 
+
    
+
      
-
-
-
-
-
-
    ‘-alldirections/+alldirections’
    Disables or enables line clipping to 45 degree angles. Overwrites the
-resource allDirectionLines.
-
-     

    ‘-background file’
    Selects a PPM file to be displayed as the board background (for tracing). 
-See backgroundImage in Resources for details.
-
-     

    ‘-backup value’
    Time between two backups in seconds. Passing zero disables the backup feature. 
-Overwrites the resource backupInterval.
-
-     

    ‘-c value’
    Number of characters per output line. The resource charactersPerLine is
-overwritten.
-
-     

    ‘-fontfile filename’
    The default set of symbols (font) for a new layout is read from this file. 
-All directories as defined by the resource fontPath are scanned
-for the file. The scan is only performed if the filename doesn't contain
-a directory component. The fontFile resource is changed.
-
-     

    ‘-lelement command-line’
    Sets the command to be executed when an element is loaded from a file to the
-paste buffer. The command may contain %f and %p to pass the requested filename
-and the searchpath to the command. It must write the data to its
-standard output. The related resource is elementCommand.
-
-     

    ‘-lfile command-line’
    Sets the command to be executed when a new layout is loaded from a file. 
-The command may contain %f and %p to pass the requested filename
-and the searchpath to the command. It must write the data to its
-standard output. The related resource is fileCommand.
-
-     

    ‘-lfont command-line’
    Sets the command to be executed when a font is loaded from a file. 
-The command may contain %f and %p to pass the requested filename
-and the searchpath to the command. It must write the data to its
-standard output. The related resource is fontCommand.
-
-     

    ‘-lg layergroups’
    This option overwrites the resource layerGroups. See its description
-for more information. The value is used for new layouts only.
-
-     

    ‘-libname filename’
    The default filename for the library. Overwrites the resource
-libraryFilename.
-
-     

    ‘-libpath path’
    The default search path for the the library. Overwrites the resource
-libraryPath.
-
-     

    ‘-llib command-line’
    Sets the command to be executed when an element is loaded from the library. 
-The command may contain %f and %p to pass the requested filename
-and the searchpath to the command. %a is replaces by the three arguments
-template, value and package. The command must write
-the data to its standard output. The related resource is libraryCommand.
-
-     

    ‘-llibcont command-line’
    The command lists the contents of the library. 
-The command may contain %f and %p to pass the library filename
-and the searchpath to the command. Also refer to Library File
-and Library Contents File. 
-The related resource is libraryContentsCommand.
-
-     

    ‘-loggeometry geometry’
    Determines the geometry of the log window.
-
-     

    ‘-pnl value’
    Restricts the displayed length of the name of a pin in the pinout window to
-the passed value. See also, the resource pinoutNameLength.
-
-     

    ‘-pz value’
    Sets the zoom factor for the pinout window according to the formula:
-scale = 1:(2 power value). The related resource is pinoutZoom.
-
-     

    ‘-reset/+reset’
    If enabled, all connections are reset after each element is scanned. 
-This feature is only used while scanning connections to all elements. 
-See also, resetAfterElement.
-
-     

    ‘-ring/+ring’
    Overrides the resource ringBellWhenFinished. If enabled, the bell
-sounds when connection searching has finished.
-
-     

    ‘-rs string’
    Overrides the resource routeStyle. The string defines a colon
-separated list of route styles. The route styles consist of a
-comma separated list of name, line thickness, via diameter, and via drill size. 
-e.g. "Fat,50,100,40:Skinny,8,35,20:75Ohm,110,110,20"
-
-     

    ‘-s/+s’
    Enables/Disables the saving of the previous commandline. Overrides the
-saveLastCommand resource.
+
+
    --drill-helper
    Print a centering target in large drill holes. 
+
    
+   
+     
+
+
    --align-marks
    Print alignment marks on each sheet. This is meant to ease alignment during exposure. 
+
    
+   
+     
    
+
    --outline
    Print the contents of the outline layer on each sheet. 
+
    
+   
+     
    
+
    --mirror
    Print mirror image. 
+
    
+   
+     
    
+
    --fill-page
    Scale output to make the board fit the page. 
+
    
+   
+     
    
+
    --auto-mirror
    Print mirror image of appropriate layers. 
+
    
+   
+     
    
+
    --ps-color
    Postscript output in color. 
+
    
+   
+     
+
+
    --ps-bloat <num>
    Amount to add to trace/pad/pin edges. 
+
    
+   
+     
+
+
    --ps-invert
    Draw objects as white-on-black. 
+
    
+   
+     
    
+
    --media <media-name>
    Size of the media, the postscript is fitted to. The parameter
+<media-name> can be any of the standard names for paper size: ‘A0’
+to ‘A10’, ‘B0’ to ‘B10’, ‘Letter’, ‘11x17’,
+‘Ledger’, ‘Legal’, ‘Executive’, ‘A-Size’, ‘B-size’,
+‘C-Size’, ‘D-size’, ‘E-size’, ‘US-Business_Card’,
+‘Intl-Business_Card’. 
+
    
+   
+     
+
+
    --psfade <num>
    Fade amount for assembly drawings (0.0=missing, 1.0=solid). 
+
    
+   
+     
    
+
    --scale <num>
    Scale value to compensate for printer sizing errors (1.0 = full scale). 
+
    
+   
+     
+
+
    --multi-file
    Produce multiple files, one per page, instead of a single multi page file. 
+
    
+   
+     
    
+
    --xcalib <num>
    Paper width. Used for x-Axis calibration. 
+
    
+   
+     
    
+
    --ycalib <num>
    Paper height. Used for y-Axis calibration. 
+
    
+   
+     
    
+
    --drill-copper
    Draw drill holes in pins / vias, instead of leaving solid copper. 
+
    
+   
+     
+
+
    --show-legend
    Print file name and scale on printout. 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: Postscript Export,
+Up: Command-Line Options
 
-     

    ‘-save/+save’
    See the resource description of saveInTMP for details.
+
 
-     

    ‘-sfile command-line’
    Sets the command to be executed when an layout file is saved. 
-The command may contain %f which is replaced by the filename. The command
-must read its data from the standard input. 
-The resource saveCommand is overwritten.
+
    6.14 Encapsulated Postscript Export
    
 
-     

    ‘-script filename’
    Specifies a script file containing PCB actions to be executed
-upon startup.  Overwrites the resource
-scriptFilename.
+
+     
    
+
    --eps-file <string>
    Name of the encapsulated postscript output file. Can contain a path. 
+
    
+
+     
    
+
    --eps-scale <num>
    Scale EPS output by the parameter ‘num’. 
+
    
+   
+     
+
+
    --as-shown
    Export layers as shown on screen. 
+
    
+   
+     
    
+
    --monochrome
    Convert output to monochrome. 
+
    
+   
+     
+
+
    --only-visible
    Limit the bounds of the EPS file to the visible items. 
+
    
+   
+
    
+
+
    
+Next: ,
+Previous: Encapsulated Postscript Export,
+Up: Command-Line Options
 
-     

    ‘-size <width>x<height>’
    Overrides the resource size which determines the maximum size
-of a layout.
+
 
-     

    ‘-v value’
    Sets the volume of the X speaker. The value is passed to XBell() and
-must be in the range -100..100.
+
    6.15 PNG Options
    
 
+
+     
    
+
    --outfile <string>
    Name of the file to be exported to. Can contain a path. 
 
    
-
+
+     
    
+
    --dpi
    Scale factor in pixels/inch. Set to 0 to scale to size specified in the layout. 
+
    
+   
+     
    
+
    --x-max
    Width of the png image in pixels. No constraint, when set to 0. 
+
    
+   
+     
    
+
    --y-max
    Height of the png output in pixels. No constraint, when set to 0. 
+
    
+   
+     
    
+
    --xy-max
    Maximum width and height of the PNG output in pixels. No constraint, when set to 0. 
+
    
+   
+     
    
+
    --as-shown
    Export layers as shown on screen. 
+
    
+   
+     
    
+
    --monochrome
    Convert output to monochrome. 
+
    
+   
+     
    
+
    --only-vivible
    Limit the bounds of the exported PNG image to the visible items. 
+
    
+   
+     
    
+
    --use-alpha
    Make the background and any holes transparent. 
+
    
+   
+     
    
+
    --format <string>
    File format to be exported. Parameter <string> can be ‘PNG’,
+‘GIF’, or ‘JPEG’. 
+
    
+   
+     
    
+
    --png-bloat <num><dim>
    Amount of extra thickness to add to traces, pads, or pin edges. The parameter
+‘<num><dim>’ is a number, appended by a dimension ‘mm’, ‘mil’, or
+‘pix’. If no dimension is given, the default dimension is 1/100 mil. 
+
    
+   
+     
+
+
    --photo-mode
    Export a photo realistic image of the layout. 
+
    
+   
+     
    
+
    --photo-flip-x
    In photo-realistic mode, export the reverse side of the layout. Left-right flip. 
+
    
+   
+     
    
+
    --photo-flip-y
    In photo-realistic mode, export the reverse side of the layout. Up-down flip. 
+
    
+   
 
    
-
+
 
    
-Previous: Options,
+Next: ,
+Previous: PNG Options,
 Up: Command-Line Options
 
 
    
 
-
    6.2 Special Options
    
+
    6.16 lpr Printing Options
    
 
-
    There are some special options available in addition to normal command line
-options. Each of these must be the only option specified on a command line. 
-The available special options are:
-
-     
-
-
-
-
    ‘-copyright’
    Prints out the copyright notice and terminates.
+
+     
    
+
    --lprcommand <string>
    Command to use for printing. Defaults to lpr. This can be used to produce
+PDF output with a virtual PDF printer. Example: 
    
+--lprcommand "lp -d CUPS-PDF-Printer". 
+
    
+In addition, all Postscript Export options are valid. 
+
+
    
+
+
    
+Previous: lpr Printing Options,
+Up: Command-Line Options
 
-     

    ‘-version’
    Prints out the version ID and terminates.
+
 
-     

    ‘-help’
    Prints out the usage message and terminates.
+
    6.17 nelma Options
    
 
-   
    
+
+     
    
+
    -- basename <string>
    File name prefix. 
+
    
+
+     
    
+
    --dpi <num>
    Horizontal scale factor (grid points/inch). 
+
    
+   
+     
    
+
    --copper-height <num>
    Copper layer height (um). 
+
    
+   
+     
    
+
    --substrate-height <num>
    Substrate layer height (um). 
+
    
+   
+     
    
+
    --substrate-epsilon <num>
    Substrate relative epsilon. 
+
    
 
 
 
    
@@ -2806,7 +3702,7 @@
 
 
    7 X11 Interface
    
 
-
    
+
    
 This chapter gives an overview about the additional X11 resources which
 are defined by Pcb as well as the defined action routines.
 
@@ -2826,21 +3722,21 @@
 
 
    7.1 Non-Standard X11 Application Resources
    
 
-
    
+
    
 In addition to the toolkit resources, Pcb defines the
 following resources:
 
      
-
-
+
+
 
    ‘absoluteGrid (boolean)’
    Selects if either the grid is relative to the position where it has changed
 last or absolute, the default, to the origin (0,0).
 
-     

    ‘alignmentDistance (dimension)’
    Specifies the distance between the boards outline to the alignment targets.
+     

    ‘alignmentDistance (dimension)’
    Specifies the distance between the boards outline to the alignment targets.
 
-     

    ‘allDirectionLines (boolean)’
    Enables (default) or disables clipping of new lines to 45 degree angles.
+     

    ‘allDirectionLines (boolean)’
    Enables (default) or disables clipping of new lines to 45 degree angles.
 
-     

    ‘backgroundImage (string)’
    If specified, this image will be drawn as the background for the
+     

    ‘backgroundImage (string)’
    If specified, this image will be drawn as the background for the
 board.  The purpose of this option is to allow you to use a scan of an
 existing layout as a prototype for your new layout.  To do this, there
 are some limitations as to what this image must be.  The image must be
@@ -2860,35 +3756,31 @@
 with Normal F-S dithering.  File->Save As, file type by extension,
 use .ppm as the extension.  Select Raw formatting.
 
-     

    ‘backupInterval (int)’
    Pcb has an automatic backup feature which saves the current data
+     

    ‘backupInterval (int)’
    Pcb has an automatic backup feature which saves the current data
 every n seconds. The default is 300 seconds. A value of zero disables
 the feature. The backup file is named /tmp/PCB.%i.backup by
 default (this may have been changed at compilation time via the
 BACKUP_NAME
 variable in globalconfig.h). 
 %i is replaced by the process ID. 
-See also, the command-line option -backup.
-
-     

    ‘Bloat (dimension)’
    Specifies the minimum spacing design rule in mils.
+See also, the command-line option –backup-interval.
 
-     

    ‘charactersPerLine (int)’
    Pcb uses this value to determine the page width when creating lists. 
-N, the number of characters per line, defaults to 80. 
-See also, the command-line option -c.
+     

    ‘Bloat (dimension)’
    Specifies the minimum spacing design rule in mils.
 
-     

    ‘connectedColor (color)’
    All pins, vias, lines and rectangles which are selected during a connection
+     

    ‘connectedColor (color)’
    All pins, vias, lines and rectangles which are selected during a connection
 search are drawn with this color. The default value is determined by
 XtDefaultForeground.
 
-     

    ‘cross hairColor (color)’
    This color is used to draw the cross hair cursor. The color is a result of
+     

    ‘cross hairColor (color)’
    This color is used to draw the cross hair cursor. The color is a result of
 a XOR operation with the contents of the Layout area. The result
 also depends on the default colormap of the X11 server because only
 the colormap index is used in the boolean operation and Pcb doesn't
 create its own colormap. The default setting is XtDefaultForeground.
 
-     

    ‘elementColor (color)’
    ‘elementSelectedColor (color)’
    The elements package part is drawn in these colors, for normal and selected
+     

    ‘elementColor (color)’
    ‘elementSelectedColor (color)’
    The elements package part is drawn in these colors, for normal and selected
 mode, respectively, which both default to XtDefaultForeground.
 
-     

    ‘elementCommand (string)’
    Pcb uses a user defined command to read element files. This resources
+     

    ‘elementCommand (string)’
    Pcb uses a user defined command to read element files. This resources
 is used to set the command which is executed by the users default shell. 
 Two escape sequences are defined to pass the selected filename (%f) and the
 current search path (%p). The command must write the element data
@@ -2896,74 +3788,72 @@
      
                  M4PATH="%p";export M4PATH;echo 'include(%f)' | m4
 
    
      
    Using the GNU version of m4 is highly recommended. 
-See also, the command-line option -lelement.
+See also, the command-line option –element-command.
 
-     

    ‘elementPath (string)’
    A colon separated list of directories or commands (starts with '|'). 
+     

    ‘elementPath (string)’
    A colon separated list of directories or commands (starts with '|'). 
 The path is passed to the program specified in elementCommand together
 with the selected element name. A specified command will be executed in order
 to create entries for the fileselect box. It must write its results to
 stdout one entry per line. 
 See also, the user-command le[!].
 
-     

    ‘fileCommand (string)’
    The command is executed by the user's default shell whenever existing layout
+     

    ‘fileCommand (string)’
    The command is executed by the user's default shell whenever existing layout
 files are loaded. Data is read from the command's standard output. 
 Two escape sequences may be specified to pass the selected filename (%f)
 and the current search path (%p). The default value is:
      
                  cat %f
 
    
-     
    See also, the command-line option -lfile.
+     
    See also, the command-line option –file-command.
 
-     

    ‘filePath (string)’
    A colon separated list of directories or commands (starts with '|'). 
+     

    ‘filePath (string)’
    A colon separated list of directories or commands (starts with '|'). 
 The path is passed to the program specified in fileCommand together
 with the selected filename. A specified command will be executed in order
 to create entries for the fileselect box. It must write its results to
 stdout one entry per line. 
 See also, the user-command l[!].
 
-     

    ‘fontCommand (string)’
    Loading new symbol sets also is handled by an external command. You again
+     

    ‘fontCommand (string)’
    Loading new symbol sets also is handled by an external command. You again
 may pass the selected filename and the current search path by passing
 %f and %p in the command string. Data is read from the commands standard
 output. This command defaults to
      
                  cat %f
 
    
-     
    See also, the command-line option -lfont.
+     
    See also, the command-line option –font-command.
 
-     

    ‘fontFile (string)’
    The default font for new layouts is read from this file which is searched
+     

    ‘fontFile (string)’
    The default font for new layouts is read from this file which is searched
 in the directories as defined by the resource fontPath. 
 Searching is only performed if the filename does not contain a directory
 component. 
-The default filename is default_font. 
-See also, the command-line option -fontfile.
+The default filename is default_font.
 
-     

    ‘fontPath (string)’
    This resource, a colon separated list of directories, defines the searchpath
+     

    ‘fontPath (string)’
    This resource, a colon separated list of directories, defines the searchpath
 for font files. See also, the resource fontFile.
 
-     

    ‘grid (int)’
    This resources defines the initial value of one cursor step. It defaults
+     

    ‘grid (int)’
    This resources defines the initial value of one cursor step. It defaults
 to 100 mil and any changes are saved together with the layout data.
 
-     

    ‘gridColor (color)’
    This color is used to draw the grid. The color is a result of
+     

    ‘gridColor (color)’
    This color is used to draw the grid. The color is a result of
 a INVERT operation with the contents of the Layout area. The result
 also depends on the default colormap of the X11 server because only
 the colormap index is used in the boolean operation and Pcb doesn't
 create its own colormap. The default setting is XtDefaultForeground.
 
-     

    ‘elementColor (color)’
    Elements located on the opposite side of the board are drawn in this color. 
+     

    ‘invisibleObjectsColor (color)’
    Elements located on the opposite side of the board are drawn in this color. 
 The default is XtDefaultForeground.
 
-     

    ‘layerColor1..MAX_LAYER (color)’
    ‘layerSelectedColor1..MAX_LAYER (color)’
    These resources define the drawing colors of the different layers in
+     

    ‘layerColor1..MAX_LAYER (color)’
    ‘layerSelectedColor1..MAX_LAYER (color)’
    These resources define the drawing colors of the different layers in
 normal and selected state. All values are preset to XtDefaultForeground.
 
-     

    ‘layerGroups (string)’
    The argument to this resource is a colon separated list of comma separated
+     

    ‘layerGroups (string)’
    The argument to this resource is a colon separated list of comma separated
 layer numbers (1..MAX_LAYER). All layers within one group are switched on/off
 together. The default setting is 1:2:3:...:MAX_LAYER which means
 all layers are handled separately. Grouping layers one to three looks like
 1,2,3:4:...:MAX_LAYER
-See also, the command-line option -lg.
 
-     

    ‘layerName1..MAX_LAYER (string)’
    The default name of the layers in a new layout are determined by these
+     

    ‘layerName1..MAX_LAYER (string)’
    The default name of the layers in a new layout are determined by these
 resources. The defaults are empty strings.
 
-     

    ‘libraryCommand (string)’
    Pcb uses a command to read element data from libraries. 
+     

    ‘libraryCommand (string)’
    Pcb uses a command to read element data from libraries. 
 The resources is used to set the command which is executed by the users
 default shell.  Three escape sequences are defined to pass the selected
 filename (%f), the current search path (%p) as well (%a) as the three
@@ -2971,97 +3861,94 @@
 It must write the element data to its standard output. The default value is
      
                  NONE/share/pcb/oldlib/QueryLibrary.sh %p %f %a
 
    
-     

    ‘libraryContentsCommand (string)’
    Similar to libraryCommand, Pcb uses the command specified
+     

    ‘libraryContentsCommand (string)’
    Similar to libraryCommand, Pcb uses the command specified
 by this resource to list the contents of a library.
      
              	NONE/share/pcb/oldlib/ListLibraryContents.sh %p %f
 
    
      
    is the default.
 
-     

    ‘libraryFilename (string)’
    The resource specifies the name of the library. The default value is
+     

    ‘libraryFilename (string)’
    The resource specifies the name of the library. The default value is
 pcblib unless changed at compile time
 with the LIBRARYFILENAME variable in globalconfig.h.
 
-     

    ‘libraryPath (string)’
    A colon separated list of directories that will be passed to the commands
+     

    ‘libraryPath (string)’
    A colon separated list of directories that will be passed to the commands
 specified by elementCommand and elementContentsCommand.
 
-     

    ‘lineThickness (dimension)’
    The value, in the range [1..250] (the range may be changed at compile
+     

    ‘lineThickness (dimension)’
    The value, in the range [1..250] (the range may be changed at compile
 time with the MIN_LINESIZE and MAX_LINESIZE variables in
 globalconfig.h), defines the
 initial thickness of new lines. The value is preset to ten mil.
 
-     

    ‘media (<predefined> | <width>x<height>+-<left_margin>+-<top_margin>)’
    The default (user defined) media of the PostScript device. Predefined
+     

    ‘media (<predefined> | <width>x<height>+-<left_margin>+-<top_margin>)’
    The default (user defined) media of the PostScript device. Predefined
 values are a3, a4, a5, letter, tabloit,
 ledger, legal, and executive. 
 The second way is to specify the medias width, height and margins in mil. 
 The resource defaults to a4 size unless changed at compile time
 with the DEFAULT_MEDIASIZE variable in globalconfig.h.
 
-     

    ‘offLimitColor (color)’
    The area outside the current maximum settings for width and height is drawn
+     

    ‘offLimitColor (color)’
    The area outside the current maximum settings for width and height is drawn
 with this color. The default value is determined by XtDefaultBackground.
 
-     

    ‘pinColor (color)’
    ‘pinSelectedColor(color)’
    This resource defines the drawing color of pins and pads in both states. 
+     

    ‘pinColor (color)’
    ‘pinSelectedColor(color)’
    This resource defines the drawing color of pins and pads in both states. 
 The values are preset to XtDefaultForeground.
 
-     

    ‘pinoutFont (string)’
    This fonts are used to display pin names. There is one font for each zoom
+     

    ‘pinoutFont (string)’
    This fonts are used to display pin names. There is one font for each zoom
 value. The values are preset to XtdefaultFont.
 
-     

    ‘pinoutNameLength (int)’
    This resource limits the number of characters which are displayed for
+     

    ‘pinoutNameLength (int)’
    This resource limits the number of characters which are displayed for
 pin names in the pinout window. By default the string length is limited
-to eight characters per name. 
-See also, the command-line option -pnl.
+to eight characters per name.
 
-     

    ‘pinoutOffsetX (int)’
    ‘pinoutOffsetY (int)’
    These resources determine the offset in mil of the circuit from the
+     

    ‘pinoutOffsetX (int)’
    ‘pinoutOffsetY (int)’
    These resources determine the offset in mil of the circuit from the
 upper left corner of the window when displaying pinout information. 
 Both default to 100 mil.
 
-     

    ‘pinoutTextOffsetX (int)’
    ‘pinoutTextOffsetY (int)’
    The resources determine the distance in mil between the drilling hole of a pin
+     

    ‘pinoutTextOffsetX (int)’
    ‘pinoutTextOffsetY (int)’
    The resources determine the distance in mil between the drilling hole of a pin
 to the location where its name is displayed in the pinout window. 
 They default to X:50 and Y:0.
 
-     

    ‘pinoutZoom (int)’
    Sets the zoom factor for the pinout window according to the formula:
+     

    ‘pinoutZoom (int)’
    Sets the zoom factor for the pinout window according to the formula:
 scale = 1:(2 power value). Its default value is two which results in
-a 1:4 scale. 
-See also, the command-line option -pz.
+a 1:4 scale.
 
-     

    ‘printCommand (string)’
    Default file for printouts. If the name starts with a '|' the output
+     

    ‘printCommand (string)’
    Default file for printouts. If the name starts with a '|' the output
 is piped through the command. A %f is replaced by the current filename. 
 There is no default file or command.
 
-     

    ‘raiseLogWindow (boolean)’
    The log window will be raised when new messages arrive if this resource
+     

    ‘raiseLogWindow (boolean)’
    The log window will be raised when new messages arrive if this resource
 is set true, the default.
 
-     

    ‘ratCommand (string)’
    Default command for reading a netlist. A %f is replaced by the netlist
+     

    ‘ratCommand (string)’
    Default command for reading a netlist. A %f is replaced by the netlist
 filename. Its default value is "cat %f".
 
-     

    ‘ratPath (string)’
    Default path to look for netlist files. It's default value is "."
+     

    ‘ratPath (string)’
    Default path to look for netlist files. It's default value is "."
 
-     

    ‘resetAfterElement (boolean)’
    If set to true, all found connections will be reset before a new
+     

    ‘resetAfterElement (boolean)’
    If set to true, all found connections will be reset before a new
 element is scanned. This will produce long lists when scanning the whole
 layout for connections. The resource is set to false by default. 
-The feature is only used while looking up connections of all elements. 
-See also, the command-line option -reset, +reset.
+The feature is only used while looking up connections of all elements.
 
-     

    ‘ringBellWhenFinished (boolean)’
    Whether to ring the bell (the default) when a possibly lengthy operation
+     

    ‘ringBellWhenFinished (boolean)’
    Whether to ring the bell (the default) when a possibly lengthy operation
 has finished or not. 
-See also, the command-line option -ring, +ring.
+See also, the command-line option –ring-bell-finished.
 
-     

    ‘routeStyle (string)’
    Default values for the menu of routing styles (seen in the sizes menu). 
+     

    ‘routeStyle (string)’
    Default values for the menu of routing styles (seen in the sizes menu). 
 The string is a comma separated list of name, line thickness,
 via diameter, and via drill size. 
 e.g. "Fat,50,100,40:Skinny,8,35,20:75Ohm,110,110,20"
-See also, the command-line option -rs and Sizes Menu
+See also, the command-line option –route-styles and Sizes Menu
 
-     

    ‘rubberBandMode (boolean)’
    Whether rubberband move and rotate (attached lines stretch like
+     

    ‘rubberBandMode (boolean)’
    Whether rubberband move and rotate (attached lines stretch like
 rubberbands) is enabled (the default).
 
-     

    ‘saveCommand (string)’
    This command is used to save data to a layout file. The filename may be
+     

    ‘saveCommand (string)’
    This command is used to save data to a layout file. The filename may be
 indicated by placing %f in the string. It must read the data from
 its standard input.  The default command is:
      
                  cat - > %f
 
    
-     
    See also, the command-line option -sfile.
+     
    See also, the command-line option –save-command.
 
-     

    ‘saveInTMP (boolean)’
    Enabling this resource will save all data which would otherwise be lost
+     

    ‘saveInTMP (boolean)’
    Enabling this resource will save all data which would otherwise be lost
 in a temporary file /tmp/PCB.%i.save.  The file name may
 be changed at compile time
 with the EMERGENCY_NAME variable in globalconfig.h. 
@@ -3069,36 +3956,36 @@
 %i is replaced by the process ID. 
 As an example, loading a new layout when the old one hasn't been saved would
 use this resource. 
-See also, the command-line option -save, +save.
+See also, the command-line option –save-in-tmp.
 
-     

    ‘saveLastCommand (boolean)’
    Enables the saving of the last entered user command. The option is
+     

    ‘saveLastCommand (boolean)’
    Enables the saving of the last entered user command. The option is
 disabled by default. 
-See also, the command-line option -s, +s.
+See also, the command-line option –save-last-command.
 
-     

    ‘Shrink (dimension)’
    Specifies the minimum overlap (touching) design rule in mils.
+     

    ‘Shrink (dimension)’
    Specifies the minimum overlap (touching) design rule in mils.
 
-     

    ‘size (<width>x<height>)’
    Defines the width and height of a new layout. The default is
+     

    ‘size (<width>x<height>)’
    Defines the width and height of a new layout. The default is
 7000x5000 unless changed at compile time
 with the DEFAULT_SIZE variable in globalconfig.h.
 
-     

    ‘stipllePolygons (boolean)’
    Determines whether to display polygons on the screen with a stippled
+     

    ‘stipllePolygons (boolean)’
    Determines whether to display polygons on the screen with a stippled
 pattern.  Stippling can create some amount of transparency so that
 you can still (to some extent) see layers beneath polygons. 
 It defaults to False.
 
-     

    ‘textScale (dimension)’
    The font scaling in percent is defined by this resource. The default is
+     

    ‘textScale (dimension)’
    The font scaling in percent is defined by this resource. The default is
 100 percent.
 
-     

    ‘useLogWindow (boolean)’
    Several subroutines send messages to the user if an error occurs. 
+     

    ‘useLogWindow (boolean)’
    Several subroutines send messages to the user if an error occurs. 
 This resource determines if they appear inside the log window or as a separate
 dialog box. See also, the resource raiseLogWindow and the command line
 option -loggeometry. 
 The default value is true.
 
-     

    ‘viaColor (color)’
    ‘viaSelectedColor (color)’
    This resource defines the drawing color of vias in both states. 
+     

    ‘viaColor (color)’
    ‘viaSelectedColor (color)’
    This resource defines the drawing color of vias in both states. 
 The values are preset to XtDefaultForeground.
 
-     

    ‘viaThickness (dimension)’
    ‘viaDrillingHole (dimension)’
    The initial thickness and drilling hole of new vias. The values must be in the
+     

    ‘viaThickness (dimension)’
    ‘viaDrillingHole (dimension)’
    The initial thickness and drilling hole of new vias. The values must be in the
 range [30..400] (the range may be changed at compile
 time with the MIN_PINORVIASIZE and MAX_PINEORVIASIZE variables in
 globalconfig.h), with at least 20
@@ -3106,15 +3993,15 @@
 The default thickness is 40 mil and the default drilling hole is
 20 mil.
 
-     

    ‘volume (int)’
    The value is passed to XBell() which sets the volume of the X
+     

    ‘volume (int)’
    The value is passed to XBell() which sets the volume of the X
 speaker. 
 The value lies in the range -100..100 and it defaults to the maximum volume of
 100.
 
-     

    ‘warnColor (color)’
    This resources defines the color to be used for drawing pins and pads when
+     

    ‘warnColor (color)’
    This resources defines the color to be used for drawing pins and pads when
 a warning has been issued about them.
 
-     

    ‘zoom (int)’
    The initial value for output scaling is set according to the following
+     

    ‘zoom (int)’
    The initial value for output scaling is set according to the following
 formula: scale = 1:(2 power value). It defaults to three which results
 in an output scale of 1:8.
 
@@ -3133,7 +4020,7 @@
 
 
    7.2 Actions
    
 
-
    
+
    
 All user accessible commands may be bound to almost any X event. Almost
 no default binding for commands is done in the binaries, so it is vital for the
 application that at least a system-wide application resource file exists. 
@@ -3156,16 +4043,16 @@
 SelectedObjects will handle all selected and visible objects.
 
      
-
-
-
-
+
+
+
+
 
    ‘AddRats(AllRats|SelectedRats)’
    Adds rat-lines to the layout using the loaded netlist file (see the :rn,
 User Commands.). Rat lines are added on the active layer using the current
 line thickness shown in the status line. 
 Only missing connectivity is added by the
 AddRats command so if, for example, the layout is complete nothing will be added. 
-Rat lines are drawn on the screen with a stippled pattern
+Rat lines may be drawn different to other lines on the screen
 to make them easier to identify since they cannot appear in a completed layout. 
 The rat-lines are added in the minimum length straight-line tree pattern
 (always ending on pins or pads) that satisfies the missing connectivity in the circuit. 
@@ -3185,10 +4072,10 @@
           None<Key>o:	DeleteRats(AllRats) AddRats(AllRats)
           !Shift<Key>o:	DeleteRats(SelectedRats) AddRats(SelectedRats)
    -


    ‘ApplyVendor()’
    Applies an already loaded vendor drill map to the design. +


    ‘ApplyVendor()’
    Applies an already loaded vendor drill map to the design. 
              ApplyVendor()
    -


    ‘Atomic(Save|Restore|Block|Close)’
    Controls the undo grouping of sequences of actions. Before the first action +


    ‘Atomic(Save|Restore|Block|Close)’
    Controls the undo grouping of sequences of actions. Before the first action in a group, Atomic(Save) should be issued. After each action that might be undoable, Atomic(Restore) should be issued. Atomic(Block) concludes and save the undo grouping if there was anything in the group to undo. @@ -3196,10 +4083,10 @@ actually done. Thus it might produce an "empty" undo. This can be useful when you want to use undo in a group of actions. -


    ‘Bell([-100..100])’
    Rings the bell of your display. If no value is passed the setting +


    ‘Bell([-100..100])’
    Rings the bell of your display. If no value is passed the setting of the resource volume will be used. -


    ‘ChangeClearSize(Object, value[, unit])’
    ‘ChangeClearSize(SelectedPins|SelectedVias, value[, unit])’
    The effect of this action depends on if the soldermask display is presently +


    ‘ChangeClearSize(Object, value[, unit])’
    ‘ChangeClearSize(SelectedPins|SelectedVias, value[, unit])’
    The effect of this action depends on if the soldermask display is presently turned on or off. If soldermask is displayed, then the soldermask relief size will be changed. If soldermask display is turned off, then the clearance to polygons will be changed. @@ -3208,7 +4095,7 @@ 
              !Mod1<Key>k:      ChangeClearSize(Object, +2, mil)
           !Mod1 Shift<Key>k: ChangeClearSize(Object, -2, mil)
    -


    ‘ChangeDrillSize(Object, value[, unit])’
    ‘ChangeDrillSize(SelectedPins|SelectedVias, value[, unit])’
    This action routine changes the drilling hole of pins and vias. +


    ‘ChangeDrillSize(Object, value[, unit])’
    ‘ChangeDrillSize(SelectedPins|SelectedVias, value[, unit])’
    This action routine changes the drilling hole of pins and vias. If value starts with + or -, then it adds (or subtracts) value from the current hole diameter, otherwise it sets the diameter to the value. @@ -3218,18 +4105,18 @@ 
              !Mod1<Key>s:       Change2ndSize(Object, +5, mil)
           !Mod1 Shift<Key>s: Change2ndSize(Object, -5, mil)
    -

    ‘ChangeFlag(Object|SelectElements|SelectedPins|SelectedVias|Selected,thermal|octagon|square,0|1)’
    Sets/clears the indicated flag. This adds/removes thermals, adds/removes the flag +

    ‘ChangeFlag(Object|SelectElements|SelectedPins|SelectedVias|Selected,thermal|octagon|square,0|1)’
    Sets/clears the indicated flag. This adds/removes thermals, adds/removes the flag which indicates a pin/pad should be square, or adds/removes the flag which indicates a pin/pad should be octagonal. 
              :ChangeFlag(SelectedVias,thermal,1)
           :ChangeFlag(SelectedPads,square,0)
    -


    ‘ChangeHole(Object|SelectedVias)’
    This action routine converts a via to and from a hole. A hole is +


    ‘ChangeHole(Object|SelectedVias)’
    This action routine converts a via to and from a hole. A hole is a via that has no copper annulus. The drill size for the via determines the hole diameter. 
              !Ctrl<Key>h:	ChangeHole(Object)
    -


    ‘ChangeName(Object)’
    ‘ChangeName(Layer|Layout)’
    Changes the name of the visible object at the cursor location. A text object +


    ‘ChangeName(Object)’
    ‘ChangeName(Layer|Layout)’
    Changes the name of the visible object at the cursor location. A text object doesn't have a name therefore the text string itself is changed. The element name currently used for display is always the one changed with this command. @@ -3238,17 +4125,17 @@ Default: 
              None<Key>n: ChangeName(Object)
    -

    ‘ChangeOctagon(Object|SelectElements|SelectedPins|SelectedVias|Selected)’
    Toggles what shape the affected pin(s) or via(s) will be drawn when they +

    ‘ChangeOctagon(Object|SelectElements|SelectedPins|SelectedVias|Selected)’
    Toggles what shape the affected pin(s) or via(s) will be drawn when they are not square. The shape will either be round or octagonal. Default: 
              !Ctrl<Key>o: ChangeOctagon(Object)
    -


    ‘ChangePinName(ElementName, PinNumber, PinName)’
    Changes the name for a specified pin or pad number on a specified element. +


    ‘ChangePinName(ElementName, PinNumber, PinName)’
    Changes the name for a specified pin or pad number on a specified element. This action is typically used to forward annotate pin/pad names from a schematic to the layout. 
              ChangePinName(U1, 14, VDD)
    -


    ‘ChangeSize(Object, value[, unit])’
    ‘ChangeSize(SelectedLines|SelectedPins|SelectedVias, value[, unit])’
    ‘ChangeSize(SelectedPads|SelectedTexts|SelectedNames, value[, unit])’
    ‘ChangeSize(SelectedElements, value[, unit])’
    To change the size of an object you have to bind these action to some +


    ‘ChangeSize(Object, value[, unit])’
    ‘ChangeSize(SelectedLines|SelectedPins|SelectedVias, value[, unit])’
    ‘ChangeSize(SelectedPads|SelectedTexts|SelectedNames, value[, unit])’
    ‘ChangeSize(SelectedElements, value[, unit])’
    To change the size of an object you have to bind these action to some X event (or use :ChangeSize(...)). If value begins with a + or - then the value will be added (or subtracted) from the current size, otherwise the size is set equal to value. Range checking is @@ -3264,24 +4151,24 @@ 
              None<Key>s:   ChangeSize(Object, +5)
           !Shift<Key>s: ChangeSize(Object, -5)
    -


    ‘ChangeSquare(Object|SelectedElements|SelectedPins)’
    Toggles the setting of the square flag. The flag is used to identify a +


    ‘ChangeSquare(Object|SelectedElements|SelectedPins)’
    Toggles the setting of the square flag. The flag is used to identify a certain pin, normally the first one, of circuits. It is also used to make SMD pads have square ends. 
              None<Key>q:   ChangeSquare(Object)
    -

    ‘ClrFlag(Object|SelectElements|SelectedPins|SelectedVias|Selected,thermal|octagon|square)’
    Clears the indicated flag. This removes thermals, removes the flag +

    ‘ClrFlag(Object|SelectElements|SelectedPins|SelectedVias|Selected,thermal|octagon|square)’
    Clears the indicated flag. This removes thermals, removes the flag which indicates a pin/pad should be square, or removes the flag which indicates a pin/pad should be octagonal. 
              :ClrFlag(SelectedVias,thermal)
    -


    ‘Command()’
    Calling Command() pops up an input line at the bottom of the window +


    ‘Command()’
    Calling Command() pops up an input line at the bottom of the window which allows you to enter commands. Including all action commands! The dialog ends when None<Key>Return to confirm or None<Key>Escape to abort is entered. Default: 
              <Key>colon: Command()
    -


    ‘Connection(Find)’
    ‘Connection(ResetFoundLinesAndRectangles|ResetPinsViasAndPads|Reset)’
    The Connection() action is used to mark all connections from one pin, +


    ‘Connection(Find)’
    ‘Connection(ResetFoundLinesAndRectangles|ResetPinsViasAndPads|Reset)’
    The Connection() action is used to mark all connections from one pin, line or via to others. The ResetFoundLinesAndRectangles, ResetFoundPinsAndVias and Reset arguments may be used to reset all marked lines and rectangles, @@ -3294,23 +4181,23 @@ None<Key>f: Connection(Find) !Shift<Key>f: Connection(Reset) -


    ‘DeleteRats(AllRats|SelectedRats)’
    This routine deletes either all rat-lines in the layout, or only +


    ‘DeleteRats(AllRats|SelectedRats)’
    This routine deletes either all rat-lines in the layout, or only the selected and visible ones. Non-rat-lines and other layout objects are unaffected. Default: 
              None<Key>e:   DeleteRats(AllRats)
           !Shift<Key>e: DeleteRats(SelectedRats)
    -


    ‘DisableVendor()’
    Disables automatic drill size mapping to the loaded vendor drill table. +


    ‘DisableVendor()’
    Disables automatic drill size mapping to the loaded vendor drill table. 
              DisableVendor()
    -


    ‘DisperseElements(All|Selected)’
    Disperses either all elements or only the selected elements in the +


    ‘DisperseElements(All|Selected)’
    Disperses either all elements or only the selected elements in the layout. This action should be used at the start of a design to spread out all footprints before any placement or routing is done. 
              DisperseElements(All)
    -


    ‘Display(Description|NameOnPCB|Value)’
    ‘Display(Toggle45Degree|CycleClip)’
    ‘Display(Grid|ToggleGrid)’
    ‘Display(ToggleRubberBandMode)’
    ‘Display(Center|ClearAndRedraw|Redraw)’
    ‘Display(Pinout|PinOrPadName)’
    This action routines handles some output related settings. It is +


    ‘Display(Description|NameOnPCB|Value)’
    ‘Display(Toggle45Degree|CycleClip)’
    ‘Display(Grid|ToggleGrid)’
    ‘Display(ToggleRubberBandMode)’
    ‘Display(Center|ClearAndRedraw|Redraw)’
    ‘Display(Pinout|PinOrPadName)’
    This action routines handles some output related settings. It is used to center the display around the cursor location and to redraw the output area optionally after clearing the window. Centering is done with respect to the grid setting. Displaying the @@ -3338,10 +4225,10 @@ None<Key>.: Display(Toggle45Degree) None<Key>/: Display(CycleClip) -


    ‘DRC()’
    Initiates design rule checking of the entire layout. Must be repeated +


    ‘DRC()’
    Initiates design rule checking of the entire layout. Must be repeated until no errors are found. -

    ‘ExecuteFile(filename)’
    Executes the PCB actions contained in the specified file. +

    ‘ExecuteFile(filename)’
    Executes the PCB actions contained in the specified file. This can be used to automate a complex sequence of operations. 
              :ExecuteFile(custom.cmd)
    @@ -3353,31 +4240,31 @@ SetValue(Zoom,2) DRC() -


    ‘EditLayerGroups()’
    Pops up a dialog box to edit the layergroup setting. The function is also +


    ‘EditLayerGroups()’
    Pops up a dialog box to edit the layergroup setting. The function is also available from the Objects menu. There are no defaults. -


    ‘EnableVendor()’
    Enables automatic drill size mapping to the loaded vendor drill table. +


    ‘EnableVendor()’
    Enables automatic drill size mapping to the loaded vendor drill table. 
              EnableVendor()
    -


    ‘Load(ElementToBuffer|Layout|LayoutToBuffer|Nelist)’
    This routine pops up a fileselect box to load layout, element data, +


    ‘Load(ElementToBuffer|Layout|LayoutToBuffer|Nelist)’
    This routine pops up a fileselect box to load layout, element data, or netlist. The passed filename for layout data is saved and may be reused. ElementToBuffer and LayoutToBuffer load the data into the current buffer. There are no defaults. -


    ‘LoadVendor(vendorfile)’
    Loads the specified vendor resource file. +


    ‘LoadVendor(vendorfile)’
    Loads the specified vendor resource file. 
              LoadVendor(myvendor.res)
    -


    ‘MarkCrosshair()’
    This routine marks the current cursor location with an X, and then +


    ‘MarkCrosshair()’
    This routine marks the current cursor location with an X, and then the cursor display shows both absolute position and position relative to the mark. If a mark is already present, this routine removes it and stops displaying relative cursor coordinates. Defaults: 
              !Ctrl<key>m:	MarkCrosshair()
    -


    ‘Mode(Copy|InsertPoint|Line|Move|None|PasteBuffer|Polygon|Thermal)’
    ‘Mode(Remove|Rectangle|RubberbandMove|Text|Via)’
    ‘Mode(Cycle)’
    ‘Mode(Notify)’
    ‘Mode(Save|Restore)’
    Switches to a new mode of operation. The active mode is displayed by a thick +


    ‘Mode(Copy|InsertPoint|Line|Move|None|PasteBuffer|Polygon|Thermal)’
    ‘Mode(Remove|Rectangle|RubberbandMove|Text|Via)’
    ‘Mode(Cycle)’
    ‘Mode(Notify)’
    ‘Mode(Save|Restore)’
    Switches to a new mode of operation. The active mode is displayed by a thick line around the matching mode selector button. Most of the functionality of Pcb is implemented by selecting a mode and calling Mode(Notify). The arguments Line, Polygon, @@ -3422,7 +4309,7 @@ !Mod1<Btn2Up>: Mode(Notify) Mode(Restore) Shift BTNMOD<Btn2Down>: Mode(Save) Mode(RubberbandMove) Mode(Notify) -


    ‘MovePointer(delta_x, delta_y)’
    With this function it is possible to move the cross hair cursor by using the +


    ‘MovePointer(delta_x, delta_y)’
    With this function it is possible to move the cross hair cursor by using the cursor keys. The X server's pointer follows because the necessary events are generated by Pcb. All movements are performed with respect to the currently set grid value. @@ -3436,7 +4323,7 @@ None<Key>Left: MovePointer(-1, 0) !Shift<Key>Left: MovePointer(-10, 0) -


    ‘MoveToCurrentLayer(Object|SelectedObjects)’
    The function moves a single object at the cross hair location or all selected +


    ‘MoveToCurrentLayer(Object|SelectedObjects)’
    The function moves a single object at the cross hair location or all selected objects to the current layer. Elements are not movable by this function. They have to be deleted and replaced on the other side. If a line segment is moved and the movement would result in a loss of @@ -3445,11 +4332,11 @@ 
              None<Key>m:       MoveToCurrentLayer(Object)
           !Shift<Key>m:     MoveToCurrentLayer(SelectedObjects)
    -


    ‘New()’
    Clear the current layout and starts a new one after entering its name. +


    ‘New()’
    Clear the current layout and starts a new one after entering its name. Refer to the resource backup for more information. No defaults. -


    ‘PasteBuffer(AddSelected|Clear|1..5)’
    ‘PasteBuffer(Rotate, 1..3)’
    ‘PasteBuffer(Convert)’
    This action routine controls and selects the pastebuffer as well as all +


    ‘PasteBuffer(AddSelected|Clear|1..5)’
    ‘PasteBuffer(Rotate, 1..3)’
    ‘PasteBuffer(Convert)’
    This action routine controls and selects the pastebuffer as well as all cut-and-paste operations. Passing a buffer number selects one in of the range 1..5. The statusline is updated with the new number. Rotate performs a number of 90 degree counter clockwise rotations @@ -3474,7 +4361,7 @@ !Shift<Key>5: PasteBuffer(5) None<Key>F3: Mode(PasteBuffer) -


    ‘Polygon((Close|PreviousPoint)’
    Polygons need a special action routine to make life easier. Calling +


    ‘Polygon((Close|PreviousPoint)’
    Polygons need a special action routine to make life easier. Calling Polygon(PreviousPoint) resets the newly entered corner to the previous one. The Undo action will call Polygon(PreviousPoint) when appropriate to do so. Close creates the final @@ -3484,7 +4371,7 @@ 
              None<Key>p:             Polygon(Close)
           !Shift<Key>p:           Polygon(Close)
    -


    ‘Print()’
    Pops up a print control box that lets you select the output +


    ‘Print()’
    Pops up a print control box that lets you select the output device, scaling and many more options. Each run creates all files that are supported by the selected device. These are mask files as well as drilling files, silk screens and so on. The table @@ -3504,11 +4391,11 @@ with the current filename. The function is available from the file menu. There are no defaults. -


    ‘Quit()’
    Quits the application after confirming the operation. +


    ‘Quit()’
    Quits the application after confirming the operation. Default: 
              <Message>WM_PROTOCOLS: Quit()
    -


    ‘Redo()’
    This routine allows you to recover from the last undo command. +


    ‘Redo()’
    This routine allows you to recover from the last undo command. You might want to do this if you thought that undo was going to revert something other than what it actually did (in case you are confused about which operations are un-doable), or if you @@ -3521,16 +4408,16 @@ Default: 
              !Shift<Key>r:	Redo()
    -


    ‘RemoveSelected()’
    This routine removes all visible and selected objects. +


    ‘RemoveSelected()’
    This routine removes all visible and selected objects. There are no defaults. -


    ‘Report(Object|DrillReport)’
    This routine pops up a dialog box describing the various +


    ‘Report(Object|DrillReport)’
    This routine pops up a dialog box describing the various characteristics of an object (or piece of an object such as a pad or pin) in the layout at the cursor position, or a report about all of the drill holes in the layout. There are no defaults. -


    ‘RouteStyle(1|2|3|4)’
    This routine copies the sizes corresponding to the numbered route style +


    ‘RouteStyle(1|2|3|4)’
    This routine copies the sizes corresponding to the numbered route style into the active line thickens, via diameter, and via drill size. Defaults: 
              !Ctrl<Key>1: RouteStyle(1)
@@ -3540,7 +4427,7 @@
      
    The variable NUM_STYLES is set at compile time in
 globalconfig.h.
 
-     

    ‘Save(Layout|LayoutAs)’
    ‘Save(AllConnections|AllUnusedPins|ElementConnections)’
    Passing Layout saves the layout using the file from which it was
+     

    ‘Save(Layout|LayoutAs)’
    ‘Save(AllConnections|AllUnusedPins|ElementConnections)’
    Passing Layout saves the layout using the file from which it was
 loaded or, if it is a new layout, calls Save(LayoutAs) which queries
 the user for a filename. 
 The values: AllConnections, AllUnusedPins and
@@ -3548,7 +4435,7 @@
 all unused pins or the connections of a single element to a file. 
 There are no defaults.
 
-     

    ‘Select(All|Block|Connection|ToggleObject)’
    ‘Select(ElementByName|ObjectByName|PadByName|PinByName)’
    ‘Select(TextByName|ViaByName)’
    Toggles either the selection flag of the object at the cross hair position
+     

    ‘Select(All|Block|Connection|ToggleObject)’
    ‘Select(ElementByName|ObjectByName|PadByName|PinByName)’
    ‘Select(TextByName|ViaByName)’
    Toggles either the selection flag of the object at the cross hair position
 (ToggleObject) or selects all visible objects, all inside a
 rectangle or all objects which have been found during the last connection
 scan. The ByName functions use a Regular Expressions search,
@@ -3557,12 +4444,12 @@
      
              None<Btn3Down>:  Select(ToggleObject)
           None<Btn3Down>,None<Btn3Motion>: See resource file - this is complex
 
    
-     
    ‘SetFlag(Object|SelectElements|SelectedPins|SelectedVias|Selected,thermal|octagon|square)’
    Sets the indicated flag.  This adds thermals, sets the flag
+     
    ‘SetFlag(Object|SelectElements|SelectedPins|SelectedVias|Selected,thermal|octagon|square)’
    Sets the indicated flag.  This adds thermals, sets the flag
 which indicates a pin/pad should be square, or sets the flag which
 indicates a pin/pad should be octagonal.
      
              :SetFlag(Selected,thermal)
 
    
-     

    ‘SetValue(Grid|LineSize|TextScale|ViaDrillingHole|ViaSize|Zoom, value)’
    Some internal values may be changed online by this function. 
+     

    ‘SetValue(Grid|LineSize|TextScale|ViaDrillingHole|ViaSize|Zoom, value)’
    Some internal values may be changed online by this function. 
 The first parameter specifies which data has to be changed. The other one
 determines if the resource is set to the passed value, if value is
 specified without sign, or increments/decrements if it is specified with
@@ -3584,32 +4471,32 @@
           None<Key>z:        SetValue(Zoom, -1)
           !Shift<Key>z:      SetValue(Zoom, +1)
    -


    ‘SwapSides()’
    This routine changes the board side you are viewing. +


    ‘SwapSides()’
    This routine changes the board side you are viewing. Default: 
              None<Key>Tab:      SwapSides()
    -


    ‘SwitchDrawingLayer(value)’
    Makes layer number 1..MAX_LAYER the current one. +


    ‘SwitchDrawingLayer(value)’
    Makes layer number 1..MAX_LAYER the current one. Default: 
              None<Key>1:        SwitchDrawingLayer(1)
           ...
           None<Key>MAX_LAYER:        SwitchDrawingLayer(MAX_LAYER)
    -


    ‘ToggleHideName(Object|SelectedElements)’
    Toggles whether the element's name is displayed or hidden. If it +


    ‘ToggleHideName(Object|SelectedElements)’
    Toggles whether the element's name is displayed or hidden. If it is hidden you won't see it on the screen and it will not appear on the silk layer when you print the layout. 
              None<Key>h:	ToggleHideName(Object)
           !Shift<Key>h:	ToggleHideName(SelectedElements)
    -


    ‘ToggleVendor()’
    Toggles automatic drill size mapping to the loaded vendor drill table. +


    ‘ToggleVendor()’
    Toggles automatic drill size mapping to the loaded vendor drill table. 
              ToggleVendor()
    -


    ‘ToggleVisibility(Layer)’
    Toggles the visibility of the layer. +


    ‘ToggleVisibility(Layer)’
    Toggles the visibility of the layer. 
              Mod1<Key>1:	ToggleVisibility(1)
           Mod1<Key>2:	ToggleVisibility(2)
           Mod1<Key>3:	ToggleVisibility(3)
           Mod1<Key>4:	ToggleVisibility(4)
    -


    ‘Undo()’
    ‘Undo(ClearList)’
    The unlimited undo feature of Pcb allows you to recover +


    ‘Undo()’
    ‘Undo(ClearList)’
    The unlimited undo feature of Pcb allows you to recover from most operations that materially affect you work. Calling Undo() without any parameter recovers from the last (non-undo) operation. ClearList is used to release the @@ -3619,10 +4506,10 @@ 
              None<Key>u:        Undo()
           !Shift Ctrl<Key>u: Undo(ClearList)
    -


    ‘UnloadVendor()’
    Unloads the loaded vendor drill table. +


    ‘UnloadVendor()’
    Unloads the loaded vendor drill table. 
              UnloadVendor()
    -


    ‘Unselect(All|Block|Connection)’
    Unselects all visible objects, all inside a rectangle or all objects which +


    ‘Unselect(All|Block|Connection)’
    Unselects all visible objects, all inside a rectangle or all objects which have been found during the last connection scan. Default: 
              !Shift <Btn3Down>: Mode(Save) Mode(None) Unselect(Block)
@@ -3640,31 +4527,31 @@
 
 
    7.3 Default Translations
    
 
-
    
+
    
 This section covers some default translations of key and button events as
 defined in the shipped default application resource file. Most of them have
 already been listed in Actions. Pcb makes use of a nice X11
 feature; calling several action routines for one event.
 
      
-
-
-
-
+
+
+
+
 
    ‘None<Key>BackSpace:’
    ‘None<key>Delete:’
    ‘!Shift<Key>BackSpace:’
    ‘!Shift Ctrl<Btn1>:’
    The object at the cursor location is removed by None<Key>BackSpace or
 Shift Ctrl<Btn1> whereas Shift<Key>BackSpace also removes
 all other objects that are fully-connected to the one at the cursor location.
 
-     

    ‘!Mod1 Ctrl<Key>Left:’
    ‘!Mod1 Ctrl<Key>Right:’
    ‘!Mod1 Ctrl<Key>Up:’
    ‘!Mod1 Ctrl<Key>Down:’
    Scroll one page in one of the four directions.
+     

    ‘!Mod1 Ctrl<Key>Left:’
    ‘!Mod1 Ctrl<Key>Right:’
    ‘!Mod1 Ctrl<Key>Up:’
    ‘!Mod1 Ctrl<Key>Down:’
    Scroll one page in one of the four directions.
 
-     

    ‘None<Key>Left:, !Shift<Key>Left:’
    ‘None<Key>Right:, !Shift<Key>Right:’
    ‘None<Key>Up:, !Shift<Key>Up:’
    ‘None<Key>Down:, !Shift<Key>Down:’
    Move cross hair either one or ten points in grid.
+     

    ‘None<Key>Left:, !Shift<Key>Left:’
    ‘None<Key>Right:, !Shift<Key>Right:’
    ‘None<Key>Up:, !Shift<Key>Up:’
    ‘None<Key>Down:, !Shift<Key>Down:’
    Move cross hair either one or ten points in grid.
 
-     

    ‘None<Key>Return:’
    Finished user input, selects the 'default' button of dialogs.
+     

    ‘None<Key>Return:’
    Finished user input, selects the 'default' button of dialogs.
 
-     

    ‘None<Key>Escape:’
    Mode(Reset), aborts user input, selects the 'abort' button of
+     

    ‘None<Key>Escape:’
    Mode(Reset), aborts user input, selects the 'abort' button of
 dialogs or resets all modes.
 
-     

    ‘None<Btn2Down>, Btn2<Motion>, None<Btn2Up>:’
    ‘!Mod1<Btn2Down>, Btn2<Motion>, !Mod1<Btn2Up>:’
    The first sequence moves the object or element name at the cursor location. 
+     

    ‘None<Btn2Down>, Btn2<Motion>, None<Btn2Up>:’
    ‘!Mod1<Btn2Down>, Btn2<Motion>, !Mod1<Btn2Up>:’
    The first sequence moves the object or element name at the cursor location. 
 The second one copies the objects. Copying isn't available for
 element names.
 
@@ -3682,7 +4569,7 @@
 
 
    8 File Formats
    
 
-
    
+
    
 All files used by Pcb are read from the standard output of a command
 or written to the standard input of one as plain seven bit ASCII. This
 makes it possible to use any editor to change the contents of a layout file. 
@@ -3691,11 +4578,11 @@
 default_font which are shipped with Pcb. 
 For an overview refer to Intro.
 
-   
    The following sections provide the necessary information about the syntax of
+   
    The following sections provide the necessary information about the syntax of
 the files. 
 Netlist files are not created by Pcb, but it does use them. For information
 on the format of a netlist file see the :rn,
-User Commands. Rat lines are added on the current layer using the current
+User Commands. 
 The commands described allow you to add almost any additional
 functionality you may need. Examples are compressed read and write access as
 well as archives. The commands themselves are defined by the resources
@@ -3731,7 +4618,7 @@
 
 
    8.1 Pad and Line Representation
    
 
-
    
+
    
 Pads and lines (copper traces, silk screen lines, etc) are represented by the
 line end points and the aperture used to draw the line.  It is important to
 understand this when creating the pads for a new footprint.  The following figure
@@ -3758,7 +4645,7 @@
 
 
    8.2 Layout File Format
    
 
-
    
+
    
 The layout file describes a complete layout including symbols, vias,
 elements and layers with lines, rectangles and text. This is the most
 complex file of all.  As Pcb has evolved, the file format has
@@ -3811,7 +4698,7 @@
 
 
    8.3 Element File Format
    
 
-
    
+
    
 Element files are used to describe one component which then may be used
 several times within one or more layouts. You will normally split the
 file into two parts, one for the pinout and one for the package description. 
@@ -3840,7 +4727,7 @@
 
 
    8.4 Font File Format
    
 
-
    
+
    
 A number of user defined Symbols are called a font. There is only one per
 layout. All symbols are made of lines. See the file default_font
 as an example.
@@ -3858,13 +4745,13 @@
 
 
    8.5 Netlist File Format
    
 
-
    
+
    
 Netlists read by Pcb must have this simple text form:
 
 
         netname [style] NAME-PINNUM NAME2-PINNUM2 NAME3-PINNUM3 ... [\]
 
    
-   

    for each net on the layout.
    
-   where "netname" is the name of the net which must be unique for each
+   
    for each net on the layout. 
+where "netname" is the name of the net which must be unique for each
 net, [style] is an optional route-style name,
 NAME is the layout-name name given to an element,
 and PINNUM is the (usually numeric)
@@ -3897,7 +4784,7 @@
 
 
    8.6 Library Contents File Format
    
 
-
    
+
    
 There is nothing like a special library format. The ones that have been
 introduced in 1.4.1 just use some nice (and time consuming) features of GNU
 m4. The only predefined format is the one of the contents file
@@ -3930,7 +4817,7 @@
 
 
    8.7 Library File Format
    
 
-
    
+
    
 This section provides an overview about the existing m4 definitions
 of the elements. There are basically two different types of files. One
 to define element specific data like the pinout, package and so on, the
@@ -4000,10 +4887,10 @@
 
 
    8.8 File Syntax
    
 
-
    
+
    
 
 
-
+
    
    A special note about units: Older versions of pcb used mils
 (1/1000 inch) as the base unit; a value of 500 in the file meant
 half an inch.  Newer versions uses a "high resolution" syntax,
@@ -4060,7 +4947,7 @@
 
 
    8.8.1 Arc
    
 
-
+
 
    
 
    Arc [X Y Width Height Thickness Clearance StartAngle DeltaAngle SFlags]
 Arc (X Y Width Height Thickness Clearance StartAngle DeltaAngle NFlags)
@@ -4099,7 +4986,7 @@
 
 
    8.8.2 Attribute
    
 
-
+
 
    
 
    Attribute ("Name" "Value")
 
    
@@ -4129,7 +5016,7 @@
 
 
    8.8.3 Connect
    
 
-
+
 
    
 
    Connect ("PinPad")
 
    
@@ -4153,7 +5040,7 @@
 
 
    8.8.4 Cursor
    
 
-
+
 
    
 
    Cursor [X Y Zoom]
 Cursor (X Y Zoom)
@@ -4180,7 +5067,7 @@
 
 
    8.8.5 DRC
    
 
-
+
 
    
 
    DRC [Bloat Shrink Line Silk Drill Ring]
 DRC [Bloat Shrink Line Silk]
@@ -4209,7 +5096,7 @@
 
 
    8.8.6 Element
    
 
-
+
 
    
 
    Element [SFlags "Desc" "Name" "Value" MX MY TX TY TDir TScale TSFlags] (
 Element (NFlags "Desc" "Name" "Value" MX MY TX TY TDir TScale TNFlags) (
@@ -4261,7 +5148,7 @@
 
 
    8.8.7 ElementArc
    
 
-
+
 
    
 
    ElementArc [X Y Width Height StartAngle DeltaAngle Thickness]
 ElementArc (X Y Width Height StartAngle DeltaAngle Thickness)
@@ -4295,7 +5182,7 @@
 
 
    8.8.8 ElementLine
    
 
-
+
 
    
 
    ElementLine [X1 Y1 X2 Y2 Thickness]
 ElementLine (X1 Y1 X2 Y2 Thickness)
@@ -4321,7 +5208,7 @@
 
 
    8.8.9 FileVersion
    
 
-
+
 
    
 
    FileVersion[Version]
 
    
@@ -4348,7 +5235,7 @@
 
 
    8.8.10 Flags
    
 
-
+
 
    
 
    Flags(Number)
 
    
@@ -4372,7 +5259,7 @@
 
 
    8.8.11 Grid
    
 
-
+
 
    
 
    Grid [Step OffsetX OffsetY Visible]
 Grid (Step OffsetX OffsetY Visible)
@@ -4399,7 +5286,7 @@
 
 
    8.8.12 Groups
    
 
-
+
 
    
 
    Groups("String")
 
    
@@ -4430,7 +5317,7 @@
 
 
    8.8.13 Layer
    
 
-
+
 
    
 
    Layer (LayerNum "Name") (
    ... contents ...
@@ -4459,7 +5346,7 @@
 
 
    8.8.14 Line
    
 
-
+
 
    
 
    Line [X1 Y1 X2 Y2 Thickness Clearance SFlags]
 Line (X1 Y1 X2 Y2 Thickness Clearance NFlags)
@@ -4490,7 +5377,7 @@
 
 
    8.8.15 Mark
    
 
-
+
 
    
 
    Mark [X Y]
 Mark (X Y)
@@ -4514,7 +5401,7 @@
 
 
    8.8.16 Net
    
 
-
+
 
    
 
    Net ("Name" "Style") (
    ... connects ...
@@ -4539,7 +5426,7 @@
 
 
    8.8.17 Netlist
    
 
-
+
 
    
 
    Netlist ( ) (
    ... nets ...
@@ -4559,7 +5446,7 @@
 
 
    8.8.18 Pad
    
 
-
+
 
    
 
    Pad [rX1 rY1 rX2 rY2 Thickness Clearance Mask "Name" "Number" SFlags]
 Pad (rX1 rY1 rX2 rY2 Thickness Clearance Mask "Name" "Number" NFlags)
@@ -4595,7 +5482,7 @@
 
 
    8.8.19 PCB
    
 
-
+
 
    
 
    PCB ["Name" Width Height]
 PCB ("Name" Width Height]
@@ -4623,7 +5510,7 @@
 
 
    8.8.20 Pin
    
 
-
+
 
    
 
    Pin [rX rY Thickness Clearance Mask Drill "Name" "Number" SFlags]
 Pin (rX rY Thickness Clearance Mask Drill "Name" "Number" NFlags)
@@ -4658,7 +5545,7 @@
 
 
    8.8.21 PolyArea
    
 
-
+
 
    
 
    PolyArea [Area]
 
    
@@ -4680,7 +5567,7 @@
 
 
    8.8.22 Polygon
    
 
-
+
 
    
 
    Polygon (SFlags) (
    ... (X Y) ...
@@ -4712,7 +5599,7 @@
 
 
    8.8.23 Rat
    
 
-
+
 
    
 
    Rat [X1 Y1 Group1 X2 Y2 Group2 SFlags]
 Rat (X1 Y1 Group1 X2 Y2 Group2 NFlags)
@@ -4738,7 +5625,7 @@
 
 
    8.8.24 Styles
    
 
-
+
 
    
 
    Styles("String")
 
    
@@ -4779,7 +5666,7 @@
 
 
    8.8.25 Symbol
    
 
-
+
 
    
 
    Symbol [Char Delta] (
 Symbol (Char Delta) (
@@ -4806,7 +5693,7 @@
 
 
    8.8.26 SymbolLine
    
 
-
+
 
    
 
    SymbolLine [X1 Y1 X2 Y1 Thickness]
 SymbolLine (X1 Y1 X2 Y1 Thickness)
@@ -4830,7 +5717,7 @@
 
 
    8.8.27 Text
    
 
-
+
 
    
 
    Text [X Y Direction Scale "String" SFlags]
 Text (X Y Direction Scale "String" NFlags)
@@ -4862,7 +5749,7 @@
 
 
    8.8.28 Thermal
    
 
-
+
 
    
 
    Thermal [Scale]
 
    
@@ -4886,7 +5773,7 @@
 
 
    8.8.29 Via
    
 
-
+
 
    
 
    Via [X Y Thickness Clearance Mask Drill "Name" SFlags]
 Via (X Y Thickness Clearance Mask Drill "Name" NFlags)
@@ -4908,7 +5795,7 @@
 
 
 
-
+
 
    
 
 
    
@@ -4965,7 +5852,7 @@
 pad.  Primarily used for pads used as fiducials. 
 
    
-
+
 
    
 
 
    
@@ -5016,7 +5903,7 @@
 
 
    9 Library Creation
    
 
-
    
+
    
 This chapter provides a detailed look at how footprint libraries are
 created and used.  The chapter is split into two section, the first
 section covers the "old" style libraries which use the m4 macro
@@ -5445,7 +6332,7 @@
 
 
    10 Schematic Capture for PCB
    
 
-
    
+
    
 When designing a circuit board of any complexity, a schematic capture
 front-end for the design is highly desired.  Any schematic capture
 program which is able to generate a netlist in a user defined format as
@@ -5470,7 +6357,7 @@
 
 
    10.1 gEDA
    
 
-
    
+
    
 This section shows how to use gEDA as the schematic capture front-end for
 a PCB design.  This section is not intended to be complete documentation
 on gEDA and it is assumed that the user has at least some familiarity
@@ -5607,7 +6494,7 @@
    
    After the placement is complete, use the line tool to add traces to the
 board.  As traces are added, the corresponding rats line will disappear.
 
-
    10.2 Forward Annotation of Schematic Changes
    
+
    10.1.8 Forward Annotation of Schematic Changes
    
 
 
    If schematic changes are made after the layout has started,
 gsch2pcb can be used to forward annotate these changes to the
@@ -5618,7 +6505,7 @@
 schematic component value changes, adds any new components, and removes
 any deleted components.
 
-
    10.2.1 Generate Photoplot Files (RS-274X)
    
+
    10.1.9 Generate Photoplot Files (RS-274X)
    
 
 
    After the layout is complete, choose "edit layer-groupings" from the
 "Settings" menu.  The LayerGroups form lets you specify which layers
@@ -5662,9 +6549,9 @@
 
 
    
 
-
    10.3 xcircuit
    
+
    10.2 xcircuit
    
 
-
    
+
    
 If anyone cares to contribute this section, it will get added.  Please
 submit changes to the bug tracking system for PCB which can be found from
 the PCB homepage at http://pcb.gpleda.org.
@@ -5701,7 +6588,7 @@
 
 
    A.1 Compiling and Installing
    
 
-
    
+
    
 This section covers the steps which are necessary to compile the package.
 
 
      
@@ -5719,7 +6606,7 @@
 
 
      A.1.1 Quick Start
      
 
-
      
+
      
 Starting with version 2.0, Pcb has switched to a GNU
 autoconf/automake build system.  Installation of Pcb consists of
 three steps:  configuration, building, and installing. 
@@ -5738,24 +6625,24 @@
 
 
      A.1.2 Running the configure Script
      
 
-
      
+
      
 The configure script accepts all of the standard GNU configure
 options.  For a complete list of configuration options, run
 ./configure --help.
 
      
-
+
 
      ‘INFOLIBDIR’
      must be set to the directory where your GNU info files are located.
 
-     

      ‘PCBLIBDIR’
      is the path of a directory where the font files will be installed.
+     

      ‘PCBLIBDIR’
      is the path of a directory where the font files will be installed.
 
-     

      ‘DEFAULTFONT’
      the name of the default font file.
+     

      ‘DEFAULTFONT’
      the name of the default font file.
 
-     

      ‘DEFAULTLIBRARY’
      the name of the default library.
+     

      ‘DEFAULTLIBRARY’
      the name of the default library.
 
-     

      ‘GNUM4’
      the name of GNUs m4 version.
+     

      ‘GNUM4’
      the name of GNUs m4 version.
 
-     

      ‘BTNMOD’
      If your window manager has already bound Mod1 together with some
+     

      ‘BTNMOD’
      If your window manager has already bound Mod1 together with some
 function keys you may want to change this setting. This is true for HP-VUE.
 
    
      
@@ -5779,7 +6666,7 @@
 
 
      A.2 Troubleshooting
      
 
-
      
+
      
 There are some known problems. Most of them are related to
 missing parts of a standard X11 distribution. Some others are caused by
 third party applications such as X servers. To make this list more
@@ -5820,7 +6707,7 @@
 
 
      A.2.1 HP Series 700 and 800
      
 
-
      
+
      
 You have to install several X11 include files
 or, better, install a complete X11R5 release. Hewlett-Packard doesn't
 support the Athena Widgets. So the header files and libraries are missing
@@ -5843,7 +6730,7 @@
 
 
      A.2.2 Sun SPARC architecture
      
 
-
      
+
      
 There are no known problems with Sun machines if they use X11R5 instead
 of OpenWindows. Pcb compiled successfully with all kinds of
 SPARCstations Solaris-2.[345].
@@ -5861,7 +6748,7 @@
 
 
      A.2.3 Silicon Graphics
      
 
-
      
+
      
 Pcb has been tested on some boxes running either IRIX-4.0.5 or
 IRIX-5.3. The former one uses a X11R4 server. 
 There are no problems. 
@@ -5879,7 +6766,7 @@
 
 
      A.2.4 DEC Alpha
      
 
-
      
+
      
 Pcb compiled and runs without problems on DEC UNIX V3.2c.
 
 
      
@@ -5893,7 +6780,7 @@
 
 
      A.2.5 SCO Unix
      
 
-
      
+
      
 John DuBois <spcecdt@deeptht.armory.com> wrote:
 
           SCO-ODT-3.0 requires the latest version of tls003, the Athena
      widget library (available from sosco.sco.com). The main problems
@@ -5913,7 +6800,7 @@
 
 
      A.2.6 Linux
      
 
-
      
+
      
 Since the X11 version of Pcb has been developed on a Linux
 system here are no known problems.
 
@@ -5928,7 +6815,7 @@
 
 
      A.2.7 FreeBSD and NetBSD
      
 
-
      
+
      
 Pcb has been tested on NetBSD and works without any problems. 
 You may also be able to find a NetBSD package at
 ftp://ftp.netbsd.org/pub/NetBSD/packages/cad/pcb/README.html or a
@@ -5946,7 +6833,7 @@
 
 
      A.2.8 Problems related to X11
      
 
-
      
+
      
 There are a some problems related to X11R4 or systems derived from
 X11 such as OpenWindows. See Sun. You at least have to change
 all occurances of baseTranslations in the resource files to
@@ -5974,7 +6861,7 @@
 
 
      A.2.9 Problems related to TeX
      
 
-
      
+
      
 If your TeX installation complains about a missing texinfo.tex
 file copy the one included in this release (directory doc
 to your TeX macro directory. 
@@ -6171,12 +7058,7 @@
 used to create the internal menu definition as well as being installed
 in $pcblibdir.
 
-   
      You can view the internal menu definition (the default) by running
-pcb with the -dumpmenu option, like this:
-
-
           pcb -dumpmenu
-
      
-   
+
 
      
 
 
      
@@ -6188,7 +7070,7 @@
 
 
      Appendix C Element Search/Regular Expressions
      
 
-
      
+
      
 
 
      C.1 Element Search/Regular Expressions
      
 
@@ -6197,38 +7079,88 @@
 available when Pcb was built.  One difference from the regular
 expressions found in tools like awk or grep is that PCB implicitly
 adds a “^” to the begining of a regular expression and “$” to the
-end of the regular expression.  For example if you enter “C1”, the
-actual regular expression used internally is “^C1$”. 
-It is easier to show by example how to search than explain POSIX 1003.2.  The following table shows the most common
-Regular Expression characters used to find elements in Pcb:
+end of the regular expression.  For example, if you enter “C1”, the
+actual regular expression used internally is “^C1$”.  Another difference
+is that search patterns in pcb are not case sensitive. That is, “CON” is
+treated the same as “con”.
+
+   
      It is easier to show by example how to search than explain
+POSIX 1003.2.  With regular expressions most characters are just
+themselves, but some are special:
 
      
      
-
      ‘\’
      Indicates next character should not be interpreted literally if it
-normally is, and should be interpreted literally if it normally isn't. 
-
      ‘*’
      Matches 0 or more instances of preceding character. 
-
      ‘+’
      Matches 1 or more instances of preceding character. 
-
      ‘?’
      Matches 0 or 1 instances of preceding character. 
-
      ‘.’
      Matches any single character other than the newline character.
+
      ‘*’
      Matches 0 or more instances of preceding character.
+
+     
      ‘+’
      Matches 1 or more instances of preceding character.
+
+     
      ‘?’
      Matches 0 or 1 instances of preceding character.
+
+     
      ‘.’
      Matches any single character other than the newline character.
+
+     
      ‘|’
      The vertical bar is the alternation operator. It combines two
+regular expressions. The result matches if either of them matches.
+
+     
      ‘\’
      A backslash indicates the next character should not be interpreted literally
+if it normally is, and should be interpreted literally if it normally isn't.
+
+     
      ‘{n}’
      An integer n enclosed in curly brackets matches the preceding item if
+it occurs exactly n times.
+
+     
      ‘[ ]’
      A pair of square brackets matches every character they contain.  Characters
+may be given explicitly, or as ranges.
+
+     
      ‘-’
      A hyphen in the context of square brackets denotes the range between the
+preceding and the following character.  E.g., the range of digits is
+“0-9” .  The range of letters from C to K is “C-K” .
+
+     
      ‘\^ inside square brackets’
      Inside square brackets the caret is an anti operator. Its presence makes
+the square prackets match anything except the contents of the brackets.
+
+     
      ‘( )’
      Round parenthesis group parts of a regular expression. This is very much
+like they do in math formulars.
 
    
      
 
-   
      The following examples illustrate how regular expressions are used to
+   
      If you need a special character literally, you can escape it with a
+backslash.
+
+   
      The following examples illustrate how regular expressions can be used to
 specify element names (reference designators) to search for.
      
      
-
      ‘Search for the element whose name is exactly ``C1''.’
      Enter “C1”.
+
      ‘C5’
      Select the element whose name is exactly “C5”.
 
-     
      ‘Search for all elements that start with ``C'', such as capacitors:’
      Enter “C.*”.
+     
      ‘C5 | R3’
      Select C5 and R3.
 
-     
      ‘Search for all elements that start with ``C'' and end with ``1'', such as ``C1'', or ``C51'':’
      Enter “C.*1”.
+     
      ‘C.*’
      Select all elements whose name start with the letter “C”, such as C5, or
+C42, or CF1.
 
-     
      ‘Search for only R1 or R10, will not match R100:’
      Enter “R10?”.
+     
      ‘C.*1’
      Select all elements that start with “C” and end with “1”, such as C1,
+or C51 or C5/9B71.
 
-     
      ‘Search for all parts starting with ``R12'' and ending with the number eight, or eighty-eight etc:’
      Enter “R128+”.
+     
      ‘R10?’
      Search for R1 or R10, but will not select R100 or R105. The question mark
+is a quantifier for the character “0”.
 
-     
      ‘Search for all terminal blocks having a one digit designator’
      such as “TB1”, “TB2”, or “TBx”:
-"TB.".
+     
      ‘R128+’
      Selects R128, R1288, R12888, etc.
 
-     
      ‘Search for all terminal blocks having a two digit designator such as TB21 or TB15:’
      "TB..".
+     
      ‘TB.’
      Select all terminal blocks having exactly one character designator after
+“TB” such as TB1, TBA, or TBx but not TB.
+
+     
      ‘TB..’
      Select all terminal blocks having a two character designator such as TB21 or
+TB1a.
+
+     
      ‘TB.*’
      Select all terminal blocks with any designator.
+
+     
      ‘.*31’
      Select all items, whose name ends with “31” such as Q31, or R31, or R531.
+
+     
      ‘Q[12]’
      Select Q1 and Q2.
+
+     
      ‘[A-D].*’
      Select all items, whose name starts with “A”, “B”, “C”, or “D”.
+
+     
      ‘.*N{2}.*’
      Select all items, whose name contains two “N” in a row such as
+CONN23, or connA, but not CON5
+
+     
      ‘[^D].*’
      Select all items that do not start with the letter “D”, such as C2, or
+R34, but not D34
 
    
      
 
@@ -6244,7 +7176,7 @@
 
 
      Appendix D Standard Drill Size Tables
      
 
-
      
+
      
 
 
      D.1 American Standard Wire Size Drills
      
 
@@ -6421,7 +7353,7 @@
 
 
      Appendix E Centroid (X-Y) File Format
      
 
-
      
+
      
 
 
      E.1 Overview
      
 
@@ -6452,7 +7384,7 @@
 
      
    
      E.3 Computation of Centroid and Rotation
      
 
-
      The center of each element is found by averaging the (X,Y) coordinates
+
      The center of each element is found by averaging the (X,Y) coordinates
 for the center of each pin and pad in the element.  For example if an
 element has 2 pins, 1 at (1,0) and another at (1,4) then the centroid
 will be at (1,2).
@@ -6494,10 +7426,10 @@
 
 
      Appendix F Action Reference
      
 
-
      
+
      
 
 
-
+
    
      Many actions take a delta parameter as the last parameter,
 which is an amount to change something.  That delta may include
 units, as an additional parameter, such as Action(Object,5,mm). 
@@ -6513,9 +7445,9 @@
    
      Actions which take a delta parameter which do not accept all
 these options will specify what they do take.
 
-
+
 
-
+
    
      Many actions act on indicated objects on the board.  They will have
 parameters like ToggleObject or SelectedVias to indicate
 what group of objects they act on.  Unless otherwise specified, these
@@ -6579,37 +7511,37 @@
 
    • DisableVendor Action:  Disables automatic drill size mapping. 
 
    • DisperseElements Action:  Disperses elements. 
 
    • Display Action:  Several display-related actions. 
-
    • djopt Action:  Perform various optimizations on the current board
+
    • djopt Action:  Perform various optimizations on the current board. 
 
    • DRC Action:  Invoke the DRC check. 
 
    • DumpLibrary Action:  Display the entire contents of the libraries. 
 
    • elementlist Action:  Adds the given element if it doesn't already exist. 
-
    • elementsetattr Action:  Sets or clears an element-specific attribute
+
    • elementsetattr Action:  Sets or clears an element-specific attribute. 
 
    • EnableVendor Action:  Enables automatic drill size mapping. 
-
    • execcommand Action:  Runs a command
+
    • execcommand Action:  Runs a command. 
 
    • ExecuteFile Action:  Run actions from the given file. 
 
    • Flip Action:  Flip an element to the opposite side of the board. 
-
    • FontEdit Action:  Convert the current font to a PCB for editing
-
    • FontSave Action:  Convert the current PCB back to a font
+
    • FontEdit Action:  Convert the current font to a PCB for editing. 
+
    • FontSave Action:  Convert the current PCB back to a font. 
 
    • FreeRotateBuffer Action:  Rotates the current paste buffer contents by the specified angle.  The
 angle is given in degrees.  If no angle is given, the user is prompted
 for one.
 
 
    • GlobalPuller Action:  Pull all traces tight. 
 
    • h Action:  Print a help message for commands. 
-
    • Import Action:  Import schematics
+
    • Import Action:  Import schematics. 
 
    • l Action:  Loads layout data. 
 
    • le Action:  Loads an element into the current buffer. 
-
    • LoadFootprint Action:  Loads a single footprint by name
+
    • LoadFootprint Action:  Loads a single footprint by name. 
 
    • LoadFrom Action:  Load layout data from a file. 
 
    • LoadVendorFrom Action:  Loads the specified vendor resource file. 
 
    • m Action:  Loads a layout into the current buffer. 
-
    • MarkCrosshair Action:  Set/Reset the Crosshair mark
+
    • MarkCrosshair Action:  Set/Reset the Crosshair mark. 
 
    • Message Action:  Writes a message to the log window. 
 
    • MinClearGap Action:  Ensures that polygons are a minimum distance from objects. 
 
    • MinMaskGap Action:  Ensures the mask is a minimum distance from pins and pads. 
 
    • Mode Action:  Change or use the tool mode. 
 
    • MorphPolygon Action:  Converts dead polygon islands into separate polygons. 
-
    • MoveLayer Action:  Moves/Creates/Deletes Layers
+
    • MoveLayer Action:  Moves/Creates/Deletes Layers. 
 
    • MoveObject Action:  Moves the object under the crosshair. 
 
    • MoveToCurrentLayer Action:  Moves objects to the current layer. 
 
    • Netlist Action:  Perform various actions on netlists. 
@@ -6633,7 +7565,7 @@
 
    • s Action:  Saves layout data. 
 
    • SaveSettings Action:  Saves settings. 
 
    • SaveTo Action:  Saves data to a file. 
-
    • Select Action:  Toggles or sets the selection
+
    • Select Action:  Toggles or sets the selection. 
 
    • SetFlag Action:  Sets flags on objects. 
 
    • SetOctagon Action:  Sets the octagon-flag of objects. 
 
    • SetSame Action:  Sets current layer and sizes to match indicated item. 
@@ -6650,7 +7582,7 @@
 
    • ToggleVendor Action:  Toggles the state of automatic drill size mapping. 
 
    • Undo Action:  Undo recent changes. 
 
    • UnloadVendor Action:  Unloads the current vendor drill mapping table. 
-
    • Unselect Action:  unselects the object at the pointer location or the specified objects
+
    • Unselect Action:  Unselects the object at the pointer location or the specified objects. 
 
    • w Action:  Saves layout data. 
 
    • wq Action:  Saves the layout data and quits. 
 
    
@@ -6670,7 +7602,7 @@
    
    
 
    
    Add one or more rat lines to the board. 
-
+
 
      
    
 
    AllRats
    Create rat lines for all loaded nets that aren't already connected on
@@ -6701,7 +7633,7 @@
 
    
    Applies the currently loaded vendor drill table to the current design. 
 
-
+
 This will modify all of your drill holes to match the list of allowed
 sizes for your vendor.
 
@@ -6722,7 +7654,7 @@
    
    
 
    
    Save or restore the undo serial number. 
-
+
 
    
    This action allows making multiple-action bindings into an atomic
 operation that will be undone by a single Undo command.  For example,
@@ -6766,7 +7698,7 @@
 
    
    Let the user edit the attributes of the layout, current or given
 layer, or selected element. 
-
+
 
    
    This just pops up a dialog letting the user edit the attributes of the
 pcb, an element, or a layer.
@@ -6788,7 +7720,7 @@
    
    
 
    
    Auto-place selected components. 
-
+
 
    
    Attempts to re-arrange the selected components such that the nets
 connecting them are minimized.  Note that you cannot undo this.
@@ -6810,7 +7742,7 @@
    
    
 
    
    Auto-route some or all rat lines. 
-
+
 
      
    
 
    AllRats
    Attempt to autoroute all rats.
@@ -6848,7 +7780,7 @@
    
    
 
    
    Changes the clearance size of objects. 
-
+
 
    
    If the solder mask is currently showing, this action changes the
 solder mask clearance.  If the mask is not showing, this action
@@ -6872,7 +7804,7 @@
    
    
 
    
    Changes the drilling hole size of objects. 
-
+
 
 
    
 
@@ -6892,11 +7824,11 @@
 ChangeFlag(SelectedPads|SelectedTexts|SelectedNames, flag, value)
 ChangeFlag(SelectedElements, flag, value)
 flag = square | octagon | thermal | join
-"“value = 0 | 1
    
+value = 0 | 1
    
    
 
    
    Sets or clears flags on objects. 
-
+
 
    
    Toggles the given flag on the indicated object(s).  The flag may be
 one of the flags listed above (square, octagon, thermal, join).  The
@@ -6920,7 +7852,7 @@
    
    
 
    
    Changes the hole flag of objects. 
-
+
 
    
    The "hole flag" of a via determines whether the via is a
 plated-through hole (not set), or an unplated hole (set).
@@ -6942,7 +7874,7 @@
    
    
 
    
    Changes the join (clearance through polygons) of objects. 
-
+
 
    
    The join flag determines whether a line or arc, drawn to intersect a
 polygon, electrically connects to the polygon or not.  When joined,
@@ -6964,11 +7896,11 @@
 
 
    
 
    ChangeName(Object)
-"“ChangeName(Layout|Layer)
    
+ChangeName(Layout|Layer)
    
    
 
    
    Sets the name of objects. 
-
+
 
      
    
 
    Object
    Changes the name of the element under the cursor.
@@ -6997,7 +7929,7 @@
    
    
 
    
    Changes the octagon-flag of pins and vias. 
-
+
 
    
    Pins, pads, and vias can have various shapes.  All may be round.  Pins
 and pads may be square (obviously "square" pads are usually
@@ -7027,7 +7959,7 @@
    
    
 
    
    Changes the no paste flag of objects. 
-
+
 
    
    The "no paste flag" of a pad determines whether the solderpaste
  stencil will have an opening for the pad (no set) or if there wil be
@@ -7051,7 +7983,7 @@
    
    
 
    
    Sets the name of a specific pin on a specific element. 
-
+
 
    
    This can be especially useful for annotating pin names from a
 schematic to the layout without requiring knowledge of the pcb file
@@ -7080,7 +8012,7 @@
    
    
 
    
    Changes the size of objects. 
-
+
 
    
    For lines and arcs, this changes the width.  For pins and vias, this
 changes the overall diameter of the copper annulus.  For pads, this
@@ -7107,7 +8039,7 @@
    
    
 
    
    Changes the square flag of pins and pads. 
-
+
 
    
    Note that Pins means both pins and pads.
 
@@ -7140,7 +8072,7 @@
    
    
 
    
    Clears the octagon-flag of pins and vias. 
-
+
 
    
    Pins, pads, and vias can have various shapes.  All may be round.  Pins
 and pads may be square (obviously "square" pads are usually
@@ -7170,7 +8102,7 @@
    
    
 
    
    Clears the square-flag of pins and pads. 
-
+
 
    
    Note that Pins means pins and pads.
 
@@ -7206,7 +8138,7 @@
    
    
 
    
    Clears flags on objects. 
-
+
 
    
    Turns the given flag off, regardless of its previous setting.  See
 ChangeFlag.
@@ -7230,7 +8162,7 @@
    
    
 
    
    Searches connections of the object at the cursor position. 
-
+
 
    
    Connections found with this action will be highlighted in the
 “connected-color” color and will have the “found” flag set.
@@ -7244,9 +8176,6 @@
 
      
    Reset
    All “found” objects are marked “not found”.
 
-     
    Measure
    The net under the cursor is found and measured (the lengths of all
-line segments are added together)
-
    
 
 
    
@@ -7263,11 +8192,11 @@
 
 
    
 
    Delete(Object|Selected)
-Delete(AllRats|SelectedRats)  ;
    
+Delete(AllRats|SelectedRats)
    
    
 
    
    Delete stuff. 
-
+
 
 
    
 
@@ -7286,7 +8215,7 @@
    
    
 
    
    Delete rat lines. 
-
+
 
 
    
 
@@ -7307,7 +8236,7 @@
    
    Disables automatic drill size mapping. 
 
 
-   
    
+   
    
 When drill mapping is enabled, new instances of pins and vias will
 have their drill holes mapped to one of the allowed drill sizes
 specified in the currently loaded vendor drill table.
@@ -7329,7 +8258,7 @@
    
    
 
    
    Disperses elements. 
-
+
 
    
    Normally this is used when starting a board, by selecting all elements
 and then dispersing them.  This scatters the elements around the board
@@ -7358,12 +8287,11 @@
 Display(ToggleThindraw|ToggleThindrawPoly|ToggleOrthoMove|ToggleLocalRef)
 Display(ToggleCheckPlanes|ToggleShowDRC|ToggleAutoDRC)
 Display(ToggleLiveRoute|LockNames|OnlyNames)
-Display(Pinout|PinOrPadName)
-"“Display(Scroll, Direction)
+Display(Pinout|PinOrPadName)
    
    
 
    
    Several display-related actions. 
-
+
 
      
    
 
    NameOnPCB
    Description
    Value
    Specify whether all elements show their name, description, or value.
@@ -7420,6 +8348,14 @@
 
      
    ToggleName
    Selects whether the pinouts show the pin names or the pin numbers.
 
+     
    ToggleLockNames
    If set, text will ignore left mouse clicks and actions that work on
+objects under the mouse. You can still select text with a lasso (left
+mouse drag) and perform actions on the selection.
+
+     
    ToggleOnlyNames
    If set, only text will be sensitive for mouse clicks and actions that
+work on objects under the mouse. You can still select other objects
+with a lasso (left mouse drag) and perform actions on the selection.
+
      
    ToggleMask
    Turns the solder mask on or off.
 
      
    ToggleClearLine
    When set, the clear-line flag causes new lines and arcs to have their
@@ -7432,8 +8368,7 @@
 
      
    ToggleGrid
    Resets the origin of the current grid to be wherever the mouse pointer
 is (not where the crosshair currently is).  If you provide two numbers
-after this, the origin is set to that coordinate.  The numbers are in
-PCB internal units, currently 1/100 mil.
+after this, the origin is set to that coordinate.
 
      
    Grid
    Toggles whether the grid is displayed or not.
 
@@ -7444,10 +8379,6 @@
 displayed.  If the cursor is over an element, all of its pins and pads
 are affected.
 
-     
    Step <direction> <amount> <units>
    Steps the crosshair in the given direction, with 1=down/left, 2=down,
-etc, according to the numeric keypad layout.  If amount is not given,
-the crosshair steps along the grid.
-
    
    
 
 
    
@@ -7465,11 +8396,11 @@
 
    
 
    djopt(debumpify|unjaggy|simple|vianudge|viatrim|orthopull)
 djopt(auto) - all of the above
-"“djopt(miter)
    
+djopt(miter)
    
    
 
-   
    Perform various optimizations on the current board
-
+   
    Perform various optimizations on the current board. 
+
 
    
    The different types of optimizations change your board in order to
 reduce the total trace length and via count.
@@ -7524,7 +8455,7 @@
    
    
 
    
    Invoke the DRC check. 
-
+
 
    
    Note that the design rule check uses the current board rule settings,
 not the current style settings.
@@ -7546,7 +8477,7 @@
    
    
 
    
    Display the entire contents of the libraries. 
-
+
 
 
    
 
@@ -7565,7 +8496,7 @@
    
    
 
    
    Adds the given element if it doesn't already exist. 
-
+
 
      
    
 
    Start
    Indicates the start of an element list; call this before any Need
@@ -7600,8 +8531,8 @@
 
    ElementSetAttr(refdes,name[,value])
    
    
    
 
-   
    Sets or clears an element-specific attribute
-
+   
    Sets or clears an element-specific attribute. 
+
 
    
    If a value is specified, the named attribute is added (if not already
 present) or changed (if it is) to the given value.  If the value is
@@ -7626,7 +8557,7 @@
    
    Enables automatic drill size mapping. 
 
 
-   
    
+   
    
 When drill mapping is enabled, new instances of pins and vias will
 have their drill holes mapped to one of the allowed drill sizes
 specified in the currently loaded vendor drill table.  To enable drill
@@ -7649,8 +8580,8 @@
 
    ExecCommand(command)
    
    
    
 
-   
    Runs a command
-
+   
    Runs a command. 
+
 
    
    Runs the given command, which is a system executable.
 
@@ -7671,7 +8602,7 @@
    
    
 
    
    Run actions from the given file. 
-
+
 
    
    Lines starting with # are ignored.
 
@@ -7692,7 +8623,7 @@
    
    
 
    
    Flip an element to the opposite side of the board. 
-
+
 
    
    Note that the location of the element will be symmetric about the
 cursor location; i.e. if the part you are pointing at will still be at
@@ -7716,8 +8647,8 @@
 
    FontEdit()
    
    
    
 
-   
    Convert the current font to a PCB for editing
-
+   
    Convert the current font to a PCB for editing. 
+
 
 
    
 
@@ -7735,8 +8666,8 @@
 
    FontSave()
    
    
 
-   
    Convert the current PCB back to a font
-
+   
    Convert the current PCB back to a font. 
+
 
 
    
 
@@ -7758,7 +8689,7 @@
 angle is given in degrees.  If no angle is given, the user is prompted
 for one.
 
-
+
    
    Rotates the contents of the pastebuffer by an arbitrary angle.  If no
 angle is given, the user is prompted for one.
 
@@ -7779,7 +8710,7 @@
    
 
    
    Pull all traces tight. 
-
+
 
 
    
 
@@ -7825,8 +8756,8 @@
    -

    Import schematics - +

    Import schematics. +

    Imports element and netlist data from the schematics (or some other source). The first parameter, which is optional, is the mode. If not @@ -7887,7 +8818,7 @@ which shouldn't be on the board are selected and may be removed once it's determined that the deletion is appropriate. -

    In Import() is called with setnewpoint then the location +

    If Import() is called with setnewpoint, then the location of new components can be specified. This is where parts show up when they're added to the board. The default is the center of the board. @@ -7994,8 +8925,8 @@ 

    LoadFootprint(filename[,refdes,value])
    -

    Loads a single footprint by name - +

    Loads a single footprint by name. +

    Loads a single footprint by name, rather than by reference or through the library. If a refdes and value are specified, those are inserted @@ -8018,7 +8949,7 @@

    Load layout data from a file. - +

    This action assumes you know what the filename is. The various GUIs should have a similar Load action where the filename is @@ -8060,7 +8991,7 @@

    Loads the specified vendor resource file. -

    +

    filename
    Name of the vendor resource file. If not specified, the user will be prompted to enter one. @@ -8108,11 +9039,11 @@ 

    MarkCrosshair()
-"“MarkCrosshair(Center)
    +MarkCrosshair(Center)
    -

    Set/Reset the Crosshair mark - +

    Set/Reset the Crosshair mark. +

    The “mark” is a small X-shaped target on the display which is treated like a second origin (the normal origin is the upper let @@ -8141,7 +9072,7 @@

    Writes a message to the log window. - +

    This action displays a message to the log window. This action is primarily provided for use by other programs which may interface with PCB. If @@ -8162,11 +9093,11 @@ 

    MinClearGap(delta)
-"“MinClearGap(Selected, delta)
    +MinClearGap(Selected, delta)

    Ensures that polygons are a minimum distance from objects. - +

    Checks all specified objects, and increases the polygon clearance if needed to ensure a minimum distance between their edges and the @@ -8186,11 +9117,11 @@ 

    MinMaskGap(delta)
-"“MinMaskGap(Selected, delta)
    +MinMaskGap(Selected, delta)

    Ensures the mask is a minimum distance from pins and pads. - +

    Checks all specified pins and/or pads, and increases the mask if needed to ensure a minimum distance between the pin or pad edge and @@ -8212,11 +9143,11 @@ 

    Mode(Arc|Arrow|Copy|InsertPoint|Line|Lock|Move|None|PasteBuffer)
 Mode(Polygon|Rectangle|Remove|Rotate|Text|Thermal|Via)
 Mode(Notify|Release|Cancel|Stroke)
-"“Mode(Save|Restore)
    +Mode(Save|Restore)

    Change or use the tool mode. - +

    Arc
    Arrow
    Copy
    InsertPoint
    Line
    Lock
    Move
    None
    PasteBuffer
    Polygon
    Rectangle
    Remove
    Rotate
    Text
    Thermal
    Via
    Select the indicated tool. @@ -8259,7 +9190,7 @@

    Converts dead polygon islands into separate polygons. - +

    If a polygon is divided into unconnected "islands", you can use this command to convert the otherwise disappeared islands into @@ -8283,8 +9214,8 @@ 

    MoveLayer(old,new)
    -

    Moves/Creates/Deletes Layers - +

    Moves/Creates/Deletes Layers. +

    Moves a layer, creates a new layer, or deletes a layer. @@ -8330,7 +9261,7 @@

    Moves the object under the crosshair. - +

    The X and Y are treated like delta is for many other objects. For each, if it's prefixed by + or -, @@ -8355,7 +9286,7 @@

    Moves objects to the current layer. - +

    Note that moving an element from a component layer to a solder layer, or from solder to component, won't automatically flip it. Use the @@ -8380,7 +9311,7 @@

    Perform various actions on netlists. - +

    Each of these actions apply to a specified set of nets. net and pin are patterns which match one or more nets or pins; these @@ -8436,7 +9367,7 @@

    Starts a new layout. - +

    If a name is not given, one is prompted for. @@ -8457,7 +9388,7 @@

    Toggles the optimize-only-autorouted flag. - +

    The original purpose of the trace optimizer was to clean up the traces created by the various autorouters that have been used with PCB. When @@ -8487,7 +9418,7 @@

    Various operations on the paste buffer. - +

    There are a number of paste buffers; the actual limit is a compile-time constant MAX_BUFFER in globalconst.h. It @@ -8542,7 +9473,7 @@

    Some polygon related stuff. - +

    Polygons need a special action routine to make life easier. @@ -8572,7 +9503,7 @@

    Pull an arc-line junction tight. - +

    The Puller() action is a special-purpose optimization. When invoked while the crosshair is over the junction of an arc and a line, @@ -8658,7 +9589,7 @@

    Quits the application after confirming. - +

    If you have unsaved changes, you will be prompted to confirm (or save) before quitting. @@ -8680,7 +9611,7 @@

    Redo recent“undo”operations. - +

    This routine allows you to recover from the last undo command. You might want to do this if you thought that undo was going to revert @@ -8710,7 +9641,7 @@

    Removes any selected objects. - +

    @@ -8726,12 +9657,12 @@ 

    Renumber()
-"“Renumber(filename)
    +Renumber(filename)

    Renumber all elements. The changes will be recorded to filename for use in backannotating these changes to the schematic. - +

    @@ -8746,11 +9677,11 @@

    -
    Report(Object|DrillReport|FoundPins|NetLength|AllNetLengths)
    +
    Report(Object|DrillReport|FoundPins|NetLength|AllNetLengths|[,name])

    Produce various report. - +

    Object
    The object under the crosshair will be reported, describing various @@ -8788,7 +9719,7 @@

    Report on the object under the crosshair - +

    This is a shortcut for Report(Object). @@ -8809,7 +9740,7 @@

    Ripup auto-routed tracks, or convert an element to parts. - +

    All
    Removes all lines and vias which were created by the autorouter. @@ -8871,7 +9802,7 @@

    Copies the indicated routing style into the current sizes. - +

    @@ -8916,11 +9847,11 @@ 

    SaveSettings()
-"“SaveSettings(local)
    +SaveSettings(local)

    Saves settings. - +

    If you pass no arguments, the settings are stored in $HOME/.pcb/settings. If you pass the word local they're @@ -8945,7 +9876,7 @@

    Saves data to a file. - +

    Layout
    Saves the current layout. @@ -8975,20 +9906,20 @@

    -
    Select(ToggleObject)
+
    Select(Object|ToggleObject)
 Select(All|Block|Connection)
 Select(ElementByName|ObjectByName|PadByName|PinByName)
 Select(ElementByName|ObjectByName|PadByName|PinByName, Name)
-Select(TextByName|ViaByName)
-Select(TextByName|ViaByName, Name)
-"“Select(Convert)
    
+Select(TextByName|ViaByName|NetByName)
+Select(TextByName|ViaByName|NetByName, Name)
+Select(Convert)
    -

    Toggles or sets the selection - +

    Toggles or sets the selection. +

    -
    ElementByName
    ObjectByName
    PadByName
    PinByName
    TextByName
    ViaByName
    +
    ElementByName
    ObjectByName
    PadByName
    PinByName
    TextByName
    ViaByName
    NetByName
    These all rely on having a regular expression parser built into pcb. If the name is not specified then the user is prompted for a pattern, and all objects that match the pattern and are of the @@ -9028,7 +9959,7 @@

    Sets flags on objects. - +

    Turns the given flag on, regardless of its previous setting. See ChangeFlag. @@ -9052,7 +9983,7 @@

    Sets the octagon-flag of objects. - +

    Pins, pads, and vias can have various shapes. All may be round. Pins and pads may be square (obviously "square" pads are usually @@ -9082,7 +10013,7 @@

    Sets current layer and sizes to match indicated item. - +

    When invoked over any line, arc, polygon, or via, this changes the current layer to be the layer that item is on, and changes the current @@ -9105,7 +10036,7 @@

    sets the square-flag of objects. - +

    Note that Pins means pins and pads. @@ -9143,7 +10074,7 @@ Style = 3 is a solid connection to the plane.Style = 4 has diagonal fingers with rounded edges. Style = 5 has horizontal and vertical fingers with rounded edges. - +

    This changes how/whether pins or vias connect to any rectangle or polygon on the current layer. The first argument can specify one object, or all selected pins, or all selected vias, or all selected pins and vias. @@ -9176,7 +10107,7 @@

    Change various board-wide values and sizes. - +

    ViaDrillingHole
    Changes the diameter of the drill for new vias. @@ -9208,7 +10139,7 @@

    Toggles the visibility of element names. - +

    If names are hidden you won't see them on the screen and they will not appear on the silk layer when you print the layout. @@ -9232,7 +10163,7 @@

    Toggles the state of automatic drill size mapping. -

    +

    When drill mapping is enabled, new instances of pins and vias will have their drill holes mapped to one of the allowed drill sizes specified in the currently loaded vendor drill table. To enable drill @@ -9253,11 +10184,11 @@ 

    Undo()
-"“Undo(ClearList)
    +Undo(ClearList)

    Undo recent changes. - +

    The unlimited undo feature of Pcb allows you to recover from most operations that materially affect you work. Calling @@ -9289,7 +10220,7 @@

    Unloads the current vendor drill mapping table. -

    +

    @@ -9308,12 +10239,12 @@ Unselect(ElementByName|ObjectByName|PadByName|PinByName) Unselect(ElementByName|ObjectByName|PadByName|PinByName, Name) Unselect(TextByName|ViaByName) -"“Unselect(TextByName|ViaByName, Name) +Unselect(TextByName|ViaByName, Name) -

    unselects the object at the pointer location or the specified objects - +

    Unselects the object at the pointer location or the specified objects. +

    All
    Unselect all objects. @@ -9373,7 +10304,7 @@

    Saves the layout data and quits. - +

    This command has been added for the convenience of vi users and has the same functionality as s combined with q. @@ -9394,12 +10325,12 @@

    F.2 common actions

    - +
    @@ -9418,7 +10349,7 @@

    Tells the GUI that the layers have changed. - +

    This includes layer names, colors, stacking order, visibility, etc. @@ -9445,7 +10376,7 @@

    Tells the GUI that the libraries have changed. - +

    This is one of a number of actions which are part of the HID interface. The core functions use these actions to tell the current @@ -9470,7 +10401,7 @@

    Tells the GUI that the netlist has changed. - +

    This is one of a number of actions which are part of the HID interface. The core functions use these actions to tell the current @@ -9491,11 +10422,11 @@

    -
    PCBChanged()
    +
    PCBChanged([revert])
    -

    Tells the GUI that the whole PCB has changed. - +

    Tells the GUI that the whole PCB has changed. The optional“revert"parameter can be used as a hint to the GUI that the same design is beingreloaded, and that it might keep some viewport settings +

    This is one of a number of actions which are part of the HID interface. The core functions use these actions to tell the current @@ -9519,7 +10450,7 @@

    Tells the GUI that the routing styles have changed. - +

    This is one of a number of actions which are part of the HID interface. The core functions use these actions to tell the current @@ -9540,11 +10471,11 @@

  • 4 Autorouter
  • 5 User Commands
  • 6 Command-Line Options
  • 7 X11 Interface -
  • 10.2 Forward Annotation of Schematic Changes - -
  • 10.3 xcircuit +
  • 10.2 xcircuit
  • Appendix A Installation and Troubleshooting