summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2005-12-23 16:01:38 +0000
committerjlam <jlam>2005-12-23 16:01:38 +0000
commit2bd3b0b9fcd43b03216bedd4a440c1098c6035e0 (patch)
tree90dd8e0fd44ee4be9209762c3e05d77592c0a72b
parent6bbc7401fadff960d6e4c80cf3a1f815af9e4d6e (diff)
downloadpkgsrc-2bd3b0b9fcd43b03216bedd4a440c1098c6035e0.tar.gz
Remove textproc/eperl -- it doesn't compile with Perl 5.8.x at all and
nobody's fixed it in a long, long time.
-rw-r--r--textproc/Makefile3
-rw-r--r--textproc/eperl/DESCR13
-rw-r--r--textproc/eperl/Makefile23
-rw-r--r--textproc/eperl/PLIST29
-rw-r--r--textproc/eperl/distinfo10
-rw-r--r--textproc/eperl/patches/patch-aa31
-rw-r--r--textproc/eperl/patches/patch-ab44
-rw-r--r--textproc/eperl/patches/patch-ac16
-rw-r--r--textproc/eperl/patches/patch-ad13
-rw-r--r--textproc/eperl/patches/patch-ae426
10 files changed, 1 insertions, 607 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index d537fa0a863..0b006d0a62c 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.310 2005/12/04 13:43:50 mjl Exp $
+# $NetBSD: Makefile,v 1.311 2005/12/23 16:01:38 jlam Exp $
#
COMMENT= Text processing utilities (does not include desktop publishing)
@@ -64,7 +64,6 @@ SUBDIR+= eb
SUBDIR+= eblook
SUBDIR+= emacs-dict-client
SUBDIR+= enchant
-SUBDIR+= eperl
SUBDIR+= expat
SUBDIR+= expatobjc
SUBDIR+= ezxml
diff --git a/textproc/eperl/DESCR b/textproc/eperl/DESCR
deleted file mode 100644
index ffbb853b65e..00000000000
--- a/textproc/eperl/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
- ____ _
- ___| _ \ ___ _ __| |
- / _ \ |_) / _ \ '__| |
- | __/ __/ __/ | | |
- \___|_| \___|_| |_|
-
- ePerl -- Embedded Perl 5 Language
-
-ePerl interprets an ASCII file bristled with Perl 5 program statements by
-evaluating the Perl 5 code while passing through the plain ASCII data.
-It can operate in various ways: As a stand-alone Unix filter or
-integrated Perl 5 module for general file generation tasks and as a
-powerful Webserver scripting language for dynamic HTML page programming.
diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
deleted file mode 100644
index 0454e990e46..00000000000
--- a/textproc/eperl/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:20 rillig Exp $
-
-DISTNAME= eperl-2.2.14
-PKGREVISION= 3
-CATEGORIES= lang perl5 textproc
-MASTER_SITES= http://www.engelschall.com/sw/eperl/distrib/
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.engelschall.com/sw/eperl/
-COMMENT= Interpreter/preprocessor for Perl embedded in text documents
-
-PERL5_PACKLIST= auto/Parse/ePerl/.packlist
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
-PERL5_CONFIGURE= NO
-PERL5_CONFIGURE_DIRS= ${WRKSRC}/mod/Parse
-BUILD_DIRS= ${WRKSRC} ${WRKSRC}/mod/Parse
-
-post-configure: perl5-configure
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/eperl/PLIST b/textproc/eperl/PLIST
deleted file mode 100644
index 4c7cd9c7eb1..00000000000
--- a/textproc/eperl/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:36 zuntum Exp $
-bin/eperl
-man/man1/eperl.1
-share/eperl/00README
-share/eperl/demo.cgipm.iphtml
-share/eperl/demo.cgipm.phtml
-share/eperl/demo.env.iphtml
-share/eperl/demo.env.phtml
-share/eperl/demo.errout.iphtml
-share/eperl/demo.errout.phtml
-share/eperl/demo.errsyn.iphtml
-share/eperl/demo.errsyn.phtml
-share/eperl/demo.func.iphtml
-share/eperl/demo.func.phtml
-share/eperl/demo.html.iphtml
-share/eperl/demo.html.phtml
-share/eperl/demo.image.iphtml
-share/eperl/demo.image.phtml
-share/eperl/demo.lwp.iphtml
-share/eperl/demo.lwp.phtml
-share/eperl/demo.net.iphtml
-share/eperl/demo.net.phtml
-share/eperl/demo.pp.iphtml
-share/eperl/demo.pp.phtml
-share/eperl/demo.table.iphtml
-share/eperl/demo.table.phtml
-share/eperl/demo.text.iphtml
-share/eperl/demo.text.phtml
-@dirrm share/eperl
diff --git a/textproc/eperl/distinfo b/textproc/eperl/distinfo
deleted file mode 100644
index d11e36f3c51..00000000000
--- a/textproc/eperl/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 14:48:41 agc Exp $
-
-SHA1 (eperl-2.2.14.tar.gz) = cf05566602d93019a38638a6958739a1e192ead7
-RMD160 (eperl-2.2.14.tar.gz) = 708c72d4a2bc494e9b3e953aa13efd0fe7933b98
-Size (eperl-2.2.14.tar.gz) = 199664 bytes
-SHA1 (patch-aa) = 6eae0f635bae79bdd6fa88878f191e59b5f4fe92
-SHA1 (patch-ab) = 09a2274193bea7052a5367d18ec2e15ed7596129
-SHA1 (patch-ac) = c876f95efa24d348c8c42fa91123d0db316315bc
-SHA1 (patch-ad) = a96ebbbafb70829ca00fda2a840172034250e31e
-SHA1 (patch-ae) = 25b88531b1356ea1191911887204d49111aed263
diff --git a/textproc/eperl/patches/patch-aa b/textproc/eperl/patches/patch-aa
deleted file mode 100644
index 5b4eff7ffee..00000000000
--- a/textproc/eperl/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/05/12 16:00:41 hubertf Exp $
-
---- Makefile.in.orig Sun Aug 2 16:03:04 1998
-+++ Makefile.in Sat May 12 17:56:03 2001
-@@ -24,7 +24,7 @@
- CC = $(perl_cc)
- CFLAGS = @CFLAGS@ $(perl_optimize) $(perl_ccflags) -I$(perl_archlib)/CORE -I.
- DLCFLAGS = @CFLAGS@ $(perl_optimize) $(perl_cccdlflags) $(perl_ccflags) -I$(perl_archlib)/CORE -I.
--LDFLAGS = @LDFLAGS@ $(perl_ccdlflags) $(perl_ldflags) -L$(perl_archlib)/CORE
-+LDFLAGS = @LDFLAGS@ $(perl_ccdlflags) $(perl_ldflags) -L$(perl_archlib)/CORE -Wl,-R$(perl_archlib)/CORE
- LDLIBS = $(perl_dla) -lperl $(perl_libs)
- AR = @AR@
- RANLIB = @RANLIB@
-@@ -44,7 +44,7 @@
- exec_prefix = $(prefix)
- bindir = $(prefix)/bin
- libsubdir = @libsubdir@
--libdir = $(prefix)/lib$(libsubdir)
-+libdir = $(prefix)/share$(libsubdir)
- mandir = $(prefix)/man/man1
-
-
-@@ -342,7 +342,7 @@
- $(INSTALL_PROGRAM) eperl $(bindir)/eperl
- $(INSTALL_DATA) eperl.1 $(mandir)/eperl.1
- $(MKDIR) $(libdir)
-- $(CP) -r eg/* $(libdir)/
-+ $(INSTALL_DATA) eg/* $(libdir)/
-
-
- # ------------------------------------------------
diff --git a/textproc/eperl/patches/patch-ab b/textproc/eperl/patches/patch-ab
deleted file mode 100644
index d42be0fdac9..00000000000
--- a/textproc/eperl/patches/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/08/15 01:12:16 jlam Exp $
-
---- configure.in.orig Wed Dec 31 03:22:16 1997
-+++ configure.in Sat Aug 12 04:26:23 2000
-@@ -42,7 +42,7 @@
- AC_ARG_WITH(perl,dnl
- [ --with-perl=PATH force the usage of a specific installed Perl],
- perlprog=$with_perl
--perlvers=`$perlprog -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
-+perlvers=`$perlprog -v | grep "This is perl" | sed -e 's/.* version //' -e 's/.* v//' -e 's/ built.*//' -e 's/ with.*//'`
- ,
- TMPFILE=/tmp/x.$$
- rm -f $TMPFILE
-@@ -53,7 +53,7 @@
- if test -f "$dir/$perl"; then
- if test -x "$dir/$perl"; then
- perl="$dir/$perl"
-- version=`$perl -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
-+ version=`$perl -v | grep "This is perl" | sed -e 's/.* version //' -e 's/.* v//' -e 's/ built.*//' -e 's/ with.*//'`
- versionnum="`echo $version | sed -e 's/\.//g' -e 's/_//g'`"
- versionnum=`expr $versionnum - $c`
- echo "$versionnum $version $perl" >>$TMPFILE
-@@ -69,7 +69,7 @@
- PATH_PERL=$perlprog
- AC_MSG_RESULT([$perlprog v$perlvers])
- case $perlvers in
-- 5.003* | 5.004* | 5.005* | 5.006* )
-+ 5.003* | 5.004* | 5.005* | 5.006* | 5.[[1-9]]* )
- ;;
- * ) echo ""
- echo "Latest Perl found on your system is $perlvers,"
-@@ -86,6 +86,12 @@
- perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;;
- 5.00[[3-6]] )
- perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/$/00/'` ;;
-+ 5.[[1-9]].[[0-9]][[0-9]] )
-+ perlvnum=`echo $perlvers | sed -e 's/\./10/' -e 's/\.//'` ;;
-+ 5.[[1-9]].[[0-9]] )
-+ perlvnum=`echo $perlvers | sed -e 's/\./10/' -e 's/\./0/'` ;;
-+ 5.[[1-9]] )
-+ perlvnum=`echo $perlvers | sed -e 's/\./10/' -e 's/$/00/'` ;;
- * )
- perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;;
- esac
diff --git a/textproc/eperl/patches/patch-ac b/textproc/eperl/patches/patch-ac
deleted file mode 100644
index 14aee26c91f..00000000000
--- a/textproc/eperl/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/08/15 01:12:16 jlam Exp $
-
---- eperl_perl5.c.orig Sun Aug 2 10:33:55 1998
-+++ eperl_perl5.c Sat Aug 12 04:34:39 2000
-@@ -39,6 +39,11 @@
- #include "eperl_perl5_sm.h"
- #include "eperl_proto.h"
-
-+#if AC_perl_vnum >= 510600
-+#define PERL_POLLUTE 1
-+#include <embedvar.h> /* declaration of curstash */
-+#endif
-+
- #ifdef HAVE_PERL_DYNALOADER
-
- extern void boot_DynaLoader _((CV* cv));
diff --git a/textproc/eperl/patches/patch-ad b/textproc/eperl/patches/patch-ad
deleted file mode 100644
index 9f8f37aed52..00000000000
--- a/textproc/eperl/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/06/09 15:15:28 wiz Exp $
-
---- mod/Parse/Makefile.PL.orig Sat May 12 17:48:31 2001
-+++ mod/Parse/Makefile.PL Sat May 12 17:48:40 2001
-@@ -13,7 +13,7 @@
- 'NAME' => 'Parse::ePerl',
- 'VERSION_FROM' => 'ePerl.pm',
- 'INC' => "-I$root",
-- 'LIBS' => ["-L$root -leperl"],
-+ 'LIBS' => ["-L$root -Wl,-R$root -leperl"],
- );
-
- ##EOF##
diff --git a/textproc/eperl/patches/patch-ae b/textproc/eperl/patches/patch-ae
deleted file mode 100644
index a6db9f04481..00000000000
--- a/textproc/eperl/patches/patch-ae
+++ /dev/null
@@ -1,426 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/03/15 17:05:39 skrll Exp $
-
---- configure.orig Sun Aug 2 14:48:40 1998
-+++ configure
-@@ -26,7 +26,7 @@
-
-
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12
-+# Generated automatically using autoconf version 2.13
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -79,6 +79,7 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
-
-@@ -362,7 +363,7 @@
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.12"
-+ echo "configure generated by autoconf version 2.13"
- exit 0 ;;
-
- -with-* | --with-*)
-@@ -532,9 +533,11 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -571,7 +574,7 @@
- if test "${with_perl+set}" = set; then
- withval="$with_perl"
- perlprog=$with_perl
--perlvers=`$perlprog -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
-+perlvers=`$perlprog -v | grep "This is perl" | sed -e 's/.* version //' -e 's/.* v//' -e 's/ built.*//' -e 's/ with.*//'`
-
- else
- TMPFILE=/tmp/x.$$
-@@ -583,7 +586,7 @@
- if test -f "$dir/$perl"; then
- if test -x "$dir/$perl"; then
- perl="$dir/$perl"
-- version=`$perl -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
-+ version=`$perl -v | grep "This is perl" | sed -e 's/.* version //' -e 's/.* v//' -e 's/ built.*//' -e 's/ with.*//'`
- versionnum="`echo $version | sed -e 's/\.//g' -e 's/_//g'`"
- versionnum=`expr $versionnum - $c`
- echo "$versionnum $version $perl" >>$TMPFILE
-@@ -600,7 +603,7 @@
- PATH_PERL=$perlprog
- echo "$ac_t""$perlprog v$perlvers" 1>&6
- case $perlvers in
-- 5.003* | 5.004* | 5.005* | 5.006* )
-+ 5.003* | 5.004* | 5.005* | 5.006* | 5.[1-9]* )
- ;;
- * ) echo ""
- echo "Latest Perl found on your system is $perlvers,"
-@@ -617,6 +620,12 @@
- perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;;
- 5.00[3-6] )
- perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/$/00/'` ;;
-+ 5.[1-9].[0-9][0-9] )
-+ perlvnum=`echo $perlvers | sed -e 's/\./10/' -e 's/\.//'` ;;
-+ 5.[1-9].[0-9] )
-+ perlvnum=`echo $perlvers | sed -e 's/\./10/' -e 's/\./0/'` ;;
-+ 5.[1-9] )
-+ perlvnum=`echo $perlvers | sed -e 's/\./10/' -e 's/$/00/'` ;;
- * )
- perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;;
- esac
-@@ -770,8 +779,9 @@
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
-@@ -799,9 +809,10 @@
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_prog_rejected=no
-- for ac_dir in $PATH; do
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-@@ -836,6 +847,40 @@
- echo "$ac_t""no" 1>&6
- fi
-
-+ if test -z "$CC"; then
-+ case "`uname -s`" in
-+ *win32* | *WIN32*)
-+ # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:857: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ ac_cv_prog_CC="cl"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+ echo "$ac_t""$CC" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+ esac
-+ fi
- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
- fi
-
-@@ -846,15 +891,17 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
--cat > conftest.$ac_ext <<EOF
--#line 854 "configure"
-+cat > conftest.$ac_ext << EOF
-+
-+#line 900 "configure"
- #include "confdefs.h"
-+
- main(){return(0);}
- EOF
--if { (eval echo configure:858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
-@@ -868,6 +915,12 @@
- ac_cv_prog_cc_works=no
- fi
- rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-
- echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
- if test $ac_cv_prog_cc_works = no; then
-@@ -899,11 +952,15 @@
-
- if test $ac_cv_prog_gcc = yes; then
- GCC=yes
-- ac_test_CFLAGS="${CFLAGS+set}"
-- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS=
-- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:907: checking whether ${CC-cc} accepts -g" >&5
-+else
-+ GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:964: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -918,16 +975,20 @@
- fi
-
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-- if test "$ac_test_CFLAGS" = set; then
-- CFLAGS="$ac_save_CFLAGS"
-- elif test $ac_cv_prog_cc_g = yes; then
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
-- CFLAGS="-O2"
-+ CFLAGS="-g"
- fi
- else
-- GCC=
-- test "${CFLAGS+set}" = set || CFLAGS="-g"
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
- fi
-
- # Extract the first word of "ranlib", so it can be a program name with args.
-@@ -940,8 +1001,9 @@
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_RANLIB="ranlib"
-@@ -969,8 +1031,9 @@
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_AR="ar"
-@@ -997,8 +1060,9 @@
- if test -n "$SIZE"; then
- ac_cv_prog_SIZE="$SIZE" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_SIZE="size"
-@@ -1103,6 +1167,7 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# 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"
- # ./install, which can be erroneously created by make from ./install.sh.
-@@ -1112,19 +1177,20 @@
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
-- for ac_prog in ginstall installbsd scoinst install; do
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-- # OSF/1 installbsd also uses dspmsg, but is usable.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -1154,6 +1220,8 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
- INSTALL_DATA='${INSTALL} -m 644'
-@@ -1261,8 +1329,8 @@
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
- else
-@@ -1278,8 +1346,25 @@
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ :
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ CPP="${CC-cc} -nologo -E"
-+ cat > conftest.$ac_ext <<EOF
-+#line 1361 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
- else
-@@ -1292,6 +1377,8 @@
- rm -f conftest*
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
- ac_cv_prog_CPP="$CPP"
- fi
- CPP="$ac_cv_prog_CPP"
-@@ -1314,8 +1401,8 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- ac_cv_header_stdc=yes
-@@ -1418,8 +1505,8 @@
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1459,7 +1546,7 @@
- #endif
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "bool[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+ egrep "(^|[^a-zA-Z_0-9])bool[^a-zA-Z_0-9]" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_bool=yes
- else
-@@ -1726,7 +1813,7 @@
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
-- case `(ac_space=' '; set) 2>&1` in
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote substitution
- # turns \\\\ into \\, and sed turns \\ into \).
-@@ -1793,7 +1880,7 @@
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-- echo "$CONFIG_STATUS generated by autoconf version 2.12"
-+ echo "$CONFIG_STATUS generated by autoconf version 2.13"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
-@@ -1813,9 +1900,11 @@
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-@@ -1865,6 +1954,7 @@
- s%@dmalloc@%$dmalloc%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@CPP@%$CPP%g
-