diff options
| -rw-r--r-- | doc/CHANGES | 4 | ||||
| -rw-r--r-- | print/ghostscript-esp/Makefile.common | 16 | ||||
| -rw-r--r-- | print/ghostscript-esp/PLIST | 6 | ||||
| -rw-r--r-- | print/ghostscript-esp/distinfo | 8 | ||||
| -rw-r--r-- | print/ghostscript-esp/patches/patch-ad | 1886 | ||||
| -rw-r--r-- | print/ghostscript-esp/patches/patch-ae | 12 |
6 files changed, 20 insertions, 1912 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index d96b5723069..ecd40d0d780 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.2342 2003/05/28 02:34:18 jlam Exp $ +$NetBSD: CHANGES,v 1.2343 2003/05/28 03:28:46 jlam Exp $ Changes to the packages collection and infrastructure in 2003: @@ -2180,3 +2180,5 @@ Changes to the packages collection and infrastructure in 2003: Updated openslp to 1.0.11 [jlam 2003-05-27] Updated ast-ksh to 2003-04-22 [uebayasi 2003-05-28] Updated cups to 1.1.19 [jlam 2003-05-28] + Updated ghostscript-esp to 7.05.6 [jlam 2003-05-28] + Updated ghostscript-esp-nox11 to 7.05.6 [jlam 2003-05-28] diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common index 4042e7477f5..78ce49f8e46 100644 --- a/print/ghostscript-esp/Makefile.common +++ b/print/ghostscript-esp/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.4 2003/01/28 22:04:01 jlam Exp $ +# $NetBSD: Makefile.common,v 1.5 2003/05/28 03:28:05 jlam Exp $ DISTNAME= espgs-${GS_VERS}-source BASEGS_VERS= 7.05 -GS_VERS= ${BASEGS_VERS}.5 +GS_VERS= ${BASEGS_VERS}.6 WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} CATEGORIES= print MASTER_SITES= ftp://ftp.easysw.com/pub/ghostscript/ \ @@ -60,11 +60,8 @@ REPLACE_PERL= lib/fixmswrd.pl CUPS_CONFDIR?= ${PKG_SYSCONFBASE}/cups CUPS_EGDIR= ${PREFIX}/share/examples/cups -GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/Resource -GSDATADIR= ${PREFIX}/share/ghostscript/${BASEGS_VERS} DOCDIR= ${PREFIX}/share/doc/ghostscript HTMLDIR= ${PREFIX}/share/doc/html/ghostscript -LIBDIR= ${GSDATADIR}/lib PLIST_SUBST+= GS_VERS=${BASEGS_VERS} @@ -75,11 +72,9 @@ post-extract: ${MKDIR} ${WRKSRC}/obj ${RM} -f ${WRKSRC}/jpeg ${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg - cd ${WRKSRC}/lib; for file in gs_res.ps; do \ - ${SED} -e "s|/Resource/|${GS_RESOURCEDIR}/|g" \ - $${file} > $${file}.fixed; \ - ${MV} -f $${file}.fixed $${file}; \ - done + +pre-configure: + cd ${WRKSRC} && ${AUTOCONF} # Reinstall the gs binary so that it's properly stripped. post-install: @@ -94,6 +89,7 @@ post-install: .include "../../print/cups/buildlink2.mk" .include "../../print/gimp-print-lib/buildlink2.mk" +.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" diff --git a/print/ghostscript-esp/PLIST b/print/ghostscript-esp/PLIST index d379b868704..7089ce9b331 100644 --- a/print/ghostscript-esp/PLIST +++ b/print/ghostscript-esp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/09/18 23:21:33 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/05/28 03:28:06 jlam Exp $ bin/bdftops bin/dvipdf bin/eps2eps @@ -355,8 +355,6 @@ share/ghostscript/${GS_VERS}/lib/stc600p.upp share/ghostscript/${GS_VERS}/lib/stc600pl.upp share/ghostscript/${GS_VERS}/lib/stc640p.upp share/ghostscript/${GS_VERS}/lib/stc740ih.upp -share/ghostscript/${GS_VERS}/lib/stc740p.upp -share/ghostscript/${GS_VERS}/lib/stc740pl.upp share/ghostscript/${GS_VERS}/lib/stc800ih.upp share/ghostscript/${GS_VERS}/lib/stc800p.upp share/ghostscript/${GS_VERS}/lib/stc800pl.upp @@ -389,5 +387,3 @@ share/ghostscript/${GS_VERS}/lib/zeroline.ps @dirrm share/examples/ghostscript/cjk @dirrm share/examples/ghostscript @dirrm share/doc/html/ghostscript -@dirrm man/de/man1 -@dirrm man/de diff --git a/print/ghostscript-esp/distinfo b/print/ghostscript-esp/distinfo index bde066df20e..0701a4d652f 100644 --- a/print/ghostscript-esp/distinfo +++ b/print/ghostscript-esp/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.2 2002/10/24 20:08:22 bouyer Exp $ +$NetBSD: distinfo,v 1.3 2003/05/28 03:28:07 jlam Exp $ -SHA1 (ghostscript/espgs-7.05.5-source.tar.bz2) = 4f6224a3375b683a0f5f4977d6aaf67ff1598bee -Size (ghostscript/espgs-7.05.5-source.tar.bz2) = 5368020 bytes +SHA1 (ghostscript/espgs-7.05.6-source.tar.bz2) = e1e9b8194766527023b48e9b865b36c6f518de8b +Size (ghostscript/espgs-7.05.6-source.tar.bz2) = 5410541 bytes SHA1 (ghostscript/jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 Size (ghostscript/jpegsrc.v6b.tar.gz) = 613261 bytes SHA1 (patch-aa) = bbc381631bfd7ec47254cf229ebef138ac593b66 SHA1 (patch-ab) = df324d501a92cce882264900dabafe8be5f9d352 SHA1 (patch-ac) = 67308cde89fcfb7ae40220bc9b8d7cc24c0cebe2 SHA1 (patch-ad) = cabf3de75e7b9fcbd5ea793297fb4f290f51b68f -SHA1 (patch-ae) = c15454a5a9c30b4b758803f0e991609cc27f6390 +SHA1 (patch-ae) = 96ea0de519c0e6fddfd31b87b39ce76b0afb2d7d diff --git a/print/ghostscript-esp/patches/patch-ad b/print/ghostscript-esp/patches/patch-ad deleted file mode 100644 index 8fdb9418e58..00000000000 --- a/print/ghostscript-esp/patches/patch-ad +++ /dev/null @@ -1,1886 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2002/10/24 20:08:23 bouyer Exp $ - ---- configure.orig Fri Sep 6 17:11:38 2002 -+++ configure Thu Oct 24 20:50:47 2002 -@@ -1,19 +1,11 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.53. -+# Generated by GNU Autoconf 2.54. - # - # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 - # Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. -- --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr --else -- as_expr=false --fi -- -- - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## -@@ -22,11 +14,13 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' - elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix - fi - --# NLS nuisances. - # Support unset when possible. - if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -@@ -34,34 +28,39 @@ - as_unset=false - fi - --(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && -- { $as_unset LANG || test "${LANG+set}" != set; } || -- { LANG=C; export LANG; } --(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && -- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || -- { LC_ALL=C; export LC_ALL; } --(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && -- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || -- { LC_TIME=C; export LC_TIME; } --(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && -- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || -- { LC_CTYPE=C; export LC_CTYPE; } --(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && -- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || -- { LANGUAGE=C; export LANGUAGE; } --(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && -- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || -- { LC_COLLATE=C; export LC_COLLATE; } --(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && -- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || -- { LC_NUMERIC=C; export LC_NUMERIC; } --(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && -- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || -- { LC_MESSAGES=C; export LC_MESSAGES; } - -+# Work around bugs in pre-3.0 UWIN ksh. -+$as_unset ENV MAIL MAILPATH -+PS1='$ ' -+PS2='> ' -+PS4='+ ' - -+# NLS nuisances. -+for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME -+do -+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ - # Name of the executable. --as_me=`(basename "$0") 2>/dev/null || -+as_me=`$as_basename "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ -@@ -72,6 +71,7 @@ - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - -+ - # PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' -@@ -85,7 +85,7 @@ - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh -- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then -+ if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: -@@ -138,6 +138,8 @@ - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} -@@ -210,6 +212,12 @@ - fi - rm -f conf$$ conf$$.exe conf$$.file - -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ as_mkdir_p=false -+fi -+ - as_executable_p="test -f" - - # Sed expression to map a string onto a valid CPP name. -@@ -226,7 +234,7 @@ - IFS=" $as_nl" - - # CDPATH. --$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } -+$as_unset CDPATH - - - # Name of the host. -@@ -240,6 +248,7 @@ - # Initializations. - # - ac_default_prefix=/usr/local -+ac_config_libobj_dir=. - cross_compiling=no - subdirs= - MFLAGS= -@@ -296,6 +305,8 @@ - # include <unistd.h> - #endif" - -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB EGREP LIBOBJS SHARE_LIBJPEG LIBJPEGDIR SHARE_ZLIB ZLIBDIR SHARE_LIBPNG LIBPNGDIR GS COMPILE_INITS PRINTERS FILES fontpath CUPSCONFIG CUPSDEV CUPSINCLUDE cups_serverroot cups_serverbin IJSDIR IJSDEVS GIMPPRINTCONFIG STPLIB STPDEVS GLIB_CONFIG OMNIDEVS XLDFLAGS X_CFLAGS X_LIBS X_DEVS HAVE_MKSTEMP GCFLAGS LTLIBOBJS' -+ac_subst_files='' - - # Initialize some variables set by options. - ac_init_help= -@@ -719,6 +730,9 @@ - { (exit 1); exit 1; }; } - fi - fi -+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -+ { (exit 1); exit 1; }; } - srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` - ac_env_build_alias_set=${build_alias+set} - ac_env_build_alias_value=$build_alias -@@ -927,7 +941,7 @@ - # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be - # absolute. - ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` -+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` - ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` - ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - -@@ -967,7 +981,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.53. Invocation command line was -+generated by GNU Autoconf 2.54. Invocation command line was - - $ $0 $@ - -@@ -1033,12 +1047,9 @@ - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac -- case " $ac_configure_args " in -- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- ac_sep=" " ;; -- esac -+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. -+ ac_sep=" " - done - - # When interrupted or exit'd, cleanup temporary files, and complete -@@ -1050,6 +1061,7 @@ - # Save into config.log some information that might help in debugging. - { - echo -+ - cat <<\_ASBOX - ## ---------------- ## - ## Cache variables. ## -@@ -1072,6 +1084,35 @@ - esac; - } - echo -+ -+ cat <<\_ASBOX -+## ----------------- ## -+## Output variables. ## -+## ----------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=$`echo $ac_var` -+ echo "$ac_var='"'"'$ac_val'"'"'" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+## ------------- ## -+## Output files. ## -+## ------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=$`echo $ac_var` -+ echo "$ac_var='"'"'$ac_val'"'"'" -+ done | sort -+ echo -+ fi -+ - if test -s confdefs.h; then - cat <<\_ASBOX - ## ----------- ## -@@ -1079,7 +1120,7 @@ - ## ----------- ## - _ASBOX - echo -- sed "/^$/d" confdefs.h -+ sed "/^$/d" confdefs.h | sort - echo - fi - test "$ac_signal" != 0 && -@@ -1240,6 +1281,7 @@ - - - -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -1444,9 +1486,7 @@ - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift -- set dummy "$as_dir/$ac_word" ${1+"$@"} -- shift -- ac_cv_prog_CC="$@" -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi - fi - fi -@@ -1579,12 +1619,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -1613,11 +1647,10 @@ - # Be careful to initialize this variable, since it used to be cached. - # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. - ac_cv_exeext= --for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; -- ls a.out conftest 2>/dev/null; -- ls a.* conftest.* 2>/dev/null`; do -+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do -+ test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; -@@ -1631,8 +1664,10 @@ - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 --echo "$as_me: error: C compiler cannot create executables" >&2;} -+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -+check \`config.log' for details." >&5 -+echo "$as_me: error: C compiler cannot create executables -+check \`config.log' for details." >&2;} - { (exit 77); exit 77; }; } - fi - -@@ -1689,9 +1724,10 @@ - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with - # `rm'. --for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do -+for ac_file in conftest.exe conftest conftest.*; do -+ test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; -@@ -1720,12 +1756,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -1742,7 +1772,7 @@ - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -@@ -1770,12 +1800,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -1824,12 +1848,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -1875,6 +1893,97 @@ - CFLAGS= - fi - fi -+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -+if test "${ac_cv_prog_cc_stdc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_prog_cc_stdc=no -+ac_save_CC=$CC -+cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+#include <stdarg.h> -+#include <stdio.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -+struct buf { int x; }; -+FILE * (*rcsopen) (struct buf *, struct stat *, int); -+static char *e (p, i) -+ char **p; -+ int i; -+{ -+ return p[i]; -+} -+static char *f (char * (*g) (char **, int), char **p, ...) -+{ -+ char *s; -+ va_list v; -+ va_start (v,p); -+ s = g (p, va_arg (v,int)); -+ va_end (v); -+ return s; -+} -+int test (int i, double x); -+struct s1 {int (*f) (int a);}; -+struct s2 {int (*f) (double a);}; -+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -+int argc; -+char **argv; -+int -+main () -+{ -+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -+ ; -+ return 0; -+} -+_ACEOF -+# Don't try gcc -ansi; that turns off useful extensions and -+# breaks some systems' header files. -+# AIX -qlanglvl=ansi -+# Ultrix and OSF/1 -std1 -+# HP-UX 10.20 and later -Ae -+# HP-UX older versions -Aa -D_HPUX_SOURCE -+# SVR4 -Xc -D__EXTENSIONS__ -+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+do -+ CC="$ac_save_CC $ac_arg" -+ rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_prog_cc_stdc=$ac_arg -+break -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+fi -+rm -f conftest.$ac_objext -+done -+rm -f conftest.$ac_ext conftest.$ac_objext -+CC=$ac_save_CC -+ -+fi -+ -+case "x$ac_cv_prog_cc_stdc" in -+ x|xno) -+ echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6 ;; -+ *) -+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -+ CC="$CC $ac_cv_prog_cc_stdc" ;; -+esac -+ - # Some people use a C++ compiler to compile C. Since we use `exit', - # in C++ we need to declare it. In case someone uses the same compiler - # for both compiling C and C++ we need to have the C++ compiler decide -@@ -1910,12 +2019,6 @@ - #include "confdefs.h" - #include <stdlib.h> - $ac_declaration --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -1947,12 +2050,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - $ac_declaration --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2032,7 +2129,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -2065,7 +2162,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -2123,7 +2220,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -2156,7 +2253,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -2320,12 +2417,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2374,12 +2465,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2439,12 +2524,6 @@ - #include "confdefs.h" - #include <stdlib.h> - $ac_declaration --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2476,12 +2555,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - $ac_declaration --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2627,12 +2700,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2688,12 +2755,6 @@ - #include <sys/types.h> - #include <$ac_hdr> - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2754,12 +2815,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char opendir (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2800,12 +2855,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char opendir (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2863,12 +2912,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char opendir (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2909,12 +2952,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char opendir (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -2956,6 +2993,21 @@ - fi - - -+echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -+if test "${ac_cv_prog_egrep+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi -+fi -+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -+echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -+ EGREP=$ac_cv_prog_egrep -+ -+ - echo "$as_me:$LINENO: checking for ANSI C header files" >&5 - echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 - if test "${ac_cv_header_stdc+set}" = set; then -@@ -2973,7 +3025,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -3004,7 +3056,7 @@ - - _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 -@@ -3022,7 +3074,7 @@ - - _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 -@@ -3081,7 +3133,7 @@ - ( exit $ac_status ) - ac_cv_header_stdc=no - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - fi -@@ -3220,7 +3272,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -3332,7 +3384,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -3386,103 +3438,6 @@ - - - --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_prog_cc_stdc=no --ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" --#include <stdarg.h> --#include <stdio.h> --#include <sys/types.h> --#include <sys/stat.h> --/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ --struct buf { int x; }; --FILE * (*rcsopen) (struct buf *, struct stat *, int); --static char *e (p, i) -- char **p; -- int i; --{ -- return p[i]; --} --static char *f (char * (*g) (char **, int), char **p, ...) --{ -- char *s; -- va_list v; -- va_start (v,p); -- s = g (p, va_arg (v,int)); -- va_end (v); -- return s; --} --int test (int i, double x); --struct s1 {int (*f) (int a);}; --struct s2 {int (*f) (double a);}; --int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); --int argc; --char **argv; --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif --int --main () --{ --return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -- ; -- return 0; --} --_ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" --do -- CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --fi --rm -f conftest.$ac_objext --done --rm -f conftest.$ac_ext conftest.$ac_objext --CC=$ac_save_CC -- --fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -- *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; --esac -- - echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 - echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 - if test "${ac_cv_c_const+set}" = set; then -@@ -3492,12 +3447,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -3593,8 +3542,9 @@ - #line $LINENO "configure" - #include "confdefs.h" - #ifndef __cplusplus --static $ac_kw int static_foo () {return 0; } --$ac_kw int foo () {return 0; } -+typedef int foo_t; -+static $ac_kw foo_t static_foo () {return 0; } -+$ac_kw foo_t foo () {return 0; } - #endif - - _ACEOF -@@ -3643,12 +3593,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -3701,12 +3645,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -3759,12 +3697,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -3817,12 +3749,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -3849,10 +3775,42 @@ - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -+cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+$ac_includes_default -+int -+main () -+{ -+static struct stat ac_aggr; -+if (sizeof ac_aggr.st_blocks) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_member_struct_stat_st_blocks=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 - ac_cv_member_struct_stat_st_blocks=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi -+rm -f conftest.$ac_objext conftest.$ac_ext -+fi - echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5 - echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6 - if test $ac_cv_member_struct_stat_st_blocks = yes; then -@@ -3883,12 +3841,6 @@ - #include <sys/time.h> - #include <time.h> - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -3939,12 +3891,6 @@ - #include <sys/types.h> - #include <time.h> - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -4008,12 +3954,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char cos (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -4089,12 +4029,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char jpeg_set_defaults (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -4187,12 +4121,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char deflate (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -4279,12 +4207,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char png_check_sig (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -4369,7 +4291,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -4478,7 +4400,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -4811,7 +4733,7 @@ - - if test "x$CUPSCONFIG" != x; then - # LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --static --image --libs | sed -e '1,$s/-lssl//'` $LIBS" -- LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --image --libs` $LIBS" -+ LIBS="`$CUPSCONFIG --image --libs` $LIBS" - CFLAGS="`$CUPSCONFIG --cflags` $CFLAGS" - cups_serverroot="`$CUPSCONFIG --serverroot`" - cups_serverbin="`$CUPSCONFIG --serverbin`" -@@ -4925,12 +4847,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char stp_init (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -5015,7 +4931,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -5293,7 +5209,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -5332,12 +5248,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - #include <X11/Intrinsic.h> --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -5438,6 +5348,124 @@ - SAVELIBS="$LIBS" - - -+echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lICE $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char IceConnectionNumber (); -+int -+main () -+{ -+IceConnectionNumber (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_ICE_IceConnectionNumber=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_ICE_IceConnectionNumber=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBICE 1 -+_ACEOF -+ -+ LIBS="-lICE $LIBS" -+ -+fi -+ -+ -+echo "$as_me:$LINENO: checking for SmcClientID in -lSM" >&5 -+echo $ECHO_N "checking for SmcClientID in -lSM... $ECHO_C" >&6 -+if test "${ac_cv_lib_SM_SmcClientID+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lSM $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+#include "confdefs.h" -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char SmcClientID (); -+int -+main () -+{ -+SmcClientID (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_SM_SmcClientID=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_lib_SM_SmcClientID=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcClientID" >&5 -+echo "${ECHO_T}$ac_cv_lib_SM_SmcClientID" >&6 -+if test $ac_cv_lib_SM_SmcClientID = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBSM 1 -+_ACEOF -+ -+ LIBS="-lSM $LIBS" -+ -+fi -+ -+ - echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 - echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 - if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then -@@ -5456,12 +5484,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char XOpenDisplay (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -5521,12 +5543,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char XdbeQueryExtension (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -5586,12 +5602,6 @@ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char XtAppCreateShell (); --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -5637,7 +5647,11 @@ - - if test "$ac_cv_lib_Xt_XtAppCreateShell" = yes; then - X_DEVS="\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11mono.dev \$(DD)x11_.dev \$(DD)x11alt_.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev" -- X_LIBS="-lXt -lXext -lX11" -+ if test "$ac_cv_lib_SM_SmcClientID" = yes; then -+ X_LIBS="-lXt -lXext -lX11 -lSM -lICE" -+ else -+ X_LIBS="-lXt -lXext -lX11" -+ fi - fi - fi - -@@ -5671,12 +5685,6 @@ - char $ac_func (); - char (*f) (); - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -5734,12 +5742,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -5839,7 +5841,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -5923,12 +5925,6 @@ - char $ac_func (); - char (*f) (); - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -5975,7 +5971,6 @@ - fi - done - --ac_cv_func_fork_works=$ac_cv_func_fork - if test "x$ac_cv_func_fork" = xyes; then - echo "$as_me:$LINENO: checking for working fork" >&5 - echo $ECHO_N "checking for working fork... $ECHO_C" >&6 -@@ -6018,12 +6013,14 @@ - ( exit $ac_status ) - ac_cv_func_fork_works=no - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 - echo "${ECHO_T}$ac_cv_func_fork_works" >&6 - -+else -+ ac_cv_func_fork_works=$ac_cv_func_fork - fi - if test "x$ac_cv_func_fork_works" = xcross; then - case $host in -@@ -6164,7 +6161,7 @@ - ( exit $ac_status ) - ac_cv_func_vfork_works=no - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 -@@ -6212,7 +6209,7 @@ - Autoconf TIOCGETP - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "$ac_pattern" >/dev/null 2>&1; then -+ $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes - else - ac_cv_prog_gcc_traditional=no -@@ -6228,7 +6225,7 @@ - Autoconf TCGETA - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "$ac_pattern" >/dev/null 2>&1; then -+ $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes - fi - rm -f conftest* -@@ -6297,7 +6294,7 @@ - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -+ grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -6373,12 +6370,6 @@ - char *malloc (); - #endif - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -6406,7 +6397,7 @@ - ( exit $ac_status ) - ac_cv_func_malloc_works=no - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - echo "$as_me:$LINENO: result: $ac_cv_func_malloc_works" >&5 -@@ -6417,8 +6408,21 @@ - #define HAVE_MALLOC 1 - _ACEOF - -+else -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_MALLOC 0 -+_ACEOF -+ -+ LIBOBJS="$LIBOBJS malloc.$ac_objext" -+ -+cat >>confdefs.h <<\_ACEOF -+#define malloc rpl_malloc -+_ACEOF -+ - fi - -+ -+ - echo "$as_me:$LINENO: checking for working memcmp" >&5 - echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 - if test "${ac_cv_func_memcmp_working+set}" = set; then -@@ -6431,12 +6435,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -6488,7 +6486,7 @@ - ( exit $ac_status ) - ac_cv_func_memcmp_working=no - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 -@@ -6514,12 +6512,6 @@ - void (*signal ()) (); - #endif - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -6571,12 +6563,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -6608,7 +6594,7 @@ - ( exit $ac_status ) - ac_cv_func_lstat_dereferences_slashed_symlink=no - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - else - # If the `ln -s' command failed, then we probably don't even -@@ -6644,12 +6630,6 @@ - #line $LINENO "configure" - #include "confdefs.h" - $ac_includes_default --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -6678,7 +6658,7 @@ - ( exit $ac_status ) - ac_cv_func_stat_empty_string_bug=no - fi --rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi - echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 -@@ -6716,12 +6696,6 @@ - char $ac_func (); - char (*f) (); - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -6785,12 +6759,6 @@ - char _doprnt (); - char (*f) (); - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -6884,12 +6852,6 @@ - char $ac_func (); - char (*f) (); - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif - int - main () - { -@@ -6940,7 +6902,7 @@ - - - --ac_config_files="$ac_config_files Makefile pstoraster/pstoraster" -+ ac_config_files="$ac_config_files Makefile pstoraster/pstoraster" - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -6951,7 +6913,7 @@ - # config.status only pays attention to the cache file if you give it - # the --recheck option to rerun configure. - # --# `ac_cv_env_foo' variables (set or unset) will be overriden when -+# `ac_cv_env_foo' variables (set or unset) will be overridden when - # loading this file, other *unset* `ac_cv_foo' will be assigned the - # following values. - -@@ -7048,7 +7010,22 @@ - rm -f confdef2opt.sed - - -+ac_libobjs= -+ac_ltlibobjs= -+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -+ # 1. Remove the extension, and $U if already installed. -+ ac_i=`echo "$ac_i" | -+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -+ # 2. Add them. -+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+done -+LIBOBJS=$ac_libobjs - -+LTLIBOBJS=$ac_ltlibobjs -+ -+ -+ - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" -@@ -7066,7 +7043,6 @@ - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -- - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## -@@ -7075,11 +7051,13 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' - elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix - fi - --# NLS nuisances. - # Support unset when possible. - if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -@@ -7087,34 +7065,39 @@ - as_unset=false - fi - --(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && -- { $as_unset LANG || test "${LANG+set}" != set; } || -- { LANG=C; export LANG; } --(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && -- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || -- { LC_ALL=C; export LC_ALL; } --(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && -- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || -- { LC_TIME=C; export LC_TIME; } --(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && -- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || -- { LC_CTYPE=C; export LC_CTYPE; } --(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && -- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || -- { LANGUAGE=C; export LANGUAGE; } --(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && -- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || -- { LC_COLLATE=C; export LC_COLLATE; } --(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && -- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || -- { LC_NUMERIC=C; export LC_NUMERIC; } --(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && -- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || -- { LC_MESSAGES=C; export LC_MESSAGES; } - -+# Work around bugs in pre-3.0 UWIN ksh. -+$as_unset ENV MAIL MAILPATH -+PS1='$ ' -+PS2='> ' -+PS4='+ ' - -+# NLS nuisances. -+for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME -+do -+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ - # Name of the executable. --as_me=`(basename "$0") 2>/dev/null || -+as_me=`$as_basename "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ -@@ -7125,6 +7108,7 @@ - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - -+ - # PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' -@@ -7138,7 +7122,7 @@ - echo "#! /bin/sh" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh -- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then -+ if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: -@@ -7192,6 +7176,8 @@ - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} -@@ -7265,6 +7251,12 @@ - fi - rm -f conf$$ conf$$.exe conf$$.file - -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ as_mkdir_p=false -+fi -+ - as_executable_p="test -f" - - # Sed expression to map a string onto a valid CPP name. -@@ -7281,7 +7273,7 @@ - IFS=" $as_nl" - - # CDPATH. --$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } -+$as_unset CDPATH - - exec 6>&1 - -@@ -7298,7 +7290,7 @@ - cat >&5 <<_CSEOF - - This file was extended by $as_me, which was --generated by GNU Autoconf 2.53. Invocation command line was -+generated by GNU Autoconf 2.54. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -7352,7 +7344,7 @@ - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.53, -+configured by $0, generated by GNU Autoconf 2.54, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - - Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -@@ -7372,17 +7364,20 @@ - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -- shift -- set dummy "$ac_option" "$ac_optarg" ${1+"$@"} -- shift -+ ac_shift=: - ;; -- -*);; -+ -*) -+ ac_option=$1 -+ ac_optarg=$2 -+ ac_shift=shift -+ ;; - *) # This is not an option, so the user has probably given explicit - # arguments. -+ ac_option=$1 - ac_need_defaults=false;; - esac - -- case $1 in -+ case $ac_option in - # Handling of the options. - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF -@@ -7405,12 +7400,12 @@ - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) -- shift -- CONFIG_FILES="$CONFIG_FILES $1" -+ $ac_shift -+ CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) -- shift -- CONFIG_HEADERS="$CONFIG_HEADERS $1" -+ $ac_shift -+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - - # This is an error. -@@ -7532,6 +7527,7 @@ - s,@ac_ct_CXX@,$ac_ct_CXX,;t t - s,@RANLIB@,$RANLIB,;t t - s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -+s,@EGREP@,$EGREP,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@SHARE_LIBJPEG@,$SHARE_LIBJPEG,;t t - s,@LIBJPEGDIR@,$LIBJPEGDIR,;t t -@@ -7562,6 +7558,7 @@ - s,@X_DEVS@,$X_DEVS,;t t - s,@HAVE_MKSTEMP@,$HAVE_MKSTEMP,;t t - s,@GCFLAGS@,$GCFLAGS,;t t -+s,@LTLIBOBJS@,$LTLIBOBJS,;t t - CEOF - - _ACEOF -@@ -7632,25 +7629,30 @@ - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` -- { case "$ac_dir" in -- [\\/]* | ?:[\\/]* ) as_incr_dir=;; -- *) as_incr_dir=.;; --esac --as_dummy="$ac_dir" --for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do -- case $as_mkdir_dir in -- # Skip DOS drivespec -- ?:) as_incr_dir=$as_mkdir_dir ;; -- *) -- as_incr_dir=$as_incr_dir/$as_mkdir_dir -- test -d "$as_incr_dir" || -- mkdir "$as_incr_dir" || -- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac --done; } -+ { if $as_mkdir_p; then -+ mkdir -p "$ac_dir" -+ else -+ as_dir="$ac_dir" -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ { (exit 1); exit 1; }; }; } - - ac_builddir=. - -@@ -7680,7 +7682,7 @@ - # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be - # absolute. - ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` -+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` - ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` - ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - diff --git a/print/ghostscript-esp/patches/patch-ae b/print/ghostscript-esp/patches/patch-ae index fd60f4ae437..6f134d595bc 100644 --- a/print/ghostscript-esp/patches/patch-ae +++ b/print/ghostscript-esp/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2002/10/24 20:08:23 bouyer Exp $ +$NetBSD: patch-ae,v 1.2 2003/05/28 03:28:07 jlam Exp $ ---- configure.ac.orig Thu Sep 5 22:59:05 2002 -+++ configure.ac Thu Oct 24 20:50:28 2002 -@@ -400,7 +400,7 @@ +--- src/configure.ac.orig Thu Dec 12 17:44:07 2002 ++++ src/configure.ac +@@ -405,7 +405,7 @@ if test -d pstoraster; then if test "x$CUPSCONFIG" != x; then dnl Use values from CUPS config... # LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --static --image --libs | sed -e '1,$s/-lssl//'` $LIBS" @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1 2002/10/24 20:08:23 bouyer Exp $ CFLAGS="`$CUPSCONFIG --cflags` $CFLAGS" cups_serverroot="`$CUPSCONFIG --serverroot`" cups_serverbin="`$CUPSCONFIG --serverbin`" -@@ -558,6 +558,8 @@ +@@ -537,6 +537,8 @@ if test x$no_x != xyes; then SAVELIBS="$LIBS" @@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.1 2002/10/24 20:08:23 bouyer Exp $ AC_CHECK_LIB(X11,XOpenDisplay) AC_CHECK_LIB(Xext,XdbeQueryExtension) AC_CHECK_LIB(Xt,XtAppCreateShell) -@@ -566,7 +568,11 @@ +@@ -545,7 +547,11 @@ if test x$no_x != xyes; then if test "$ac_cv_lib_Xt_XtAppCreateShell" = yes; then X_DEVS="\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11mono.dev \$(DD)x11_.dev \$(DD)x11alt_.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev" |