head	1.5;
access;
symbols
	RELEASE_8_3_0:1.4
	RELEASE_9_0_0:1.4
	RELEASE_7_4_0:1.3
	RELEASE_8_2_0:1.3
	RELEASE_6_EOL:1.3
	RELEASE_8_1_0:1.3
	RELEASE_7_3_0:1.3
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2;
locks; strict;
comment	@# @;


1.5
date	2013.03.04.14.33.03;	author svnexp;	state dead;
branches;
next	1.4;

1.4
date	2011.05.18.20.24.24;	author glarkin;	state Exp;
branches;
next	1.3;

1.3
date	2010.02.06.05.44.20;	author kuriyama;	state Exp;
branches;
next	1.2;

1.2
date	2009.03.28.20.45.08;	author skv;	state Exp;
branches;
next	1.1;

1.1
date	2009.01.29.19.04.46;	author glarkin;	state Exp;
branches;
next	;


desc
@@


1.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/313374
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@--- configure.orig	1998-08-02 09:48:40.000000000 -0400
+++ configure	2011-05-18 14:18:27.000000000 -0400
@@@@ -571,7 +571,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=%%PERL_VERSION%%
 
 else
   TMPFILE=/tmp/x.$$
@@@@ -583,7 +583,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_VERSION%%
                  versionnum="`echo $version | sed -e 's/\.//g' -e 's/_//g'`"
                  versionnum=`expr $versionnum - $c`
                  echo "$versionnum $version $perl" >>$TMPFILE
@@@@ -600,7 +600,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.6.* | 5.8.* | 5.10.* | 5.12.* | 5.14.* )
         ;;
     * ) echo ""
         echo "Latest Perl found on your system is $perlvers,"
@@@@ -617,6 +617,8 @@@@
 	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; 
     5.00[3-6] ) 
 	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/$/00/'` ;; 
+    5.[68].* | 5.10.* | 5.12.* | 5.14.* ) 
+	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/\./0/' -e 's/$/00/'` ;; 
 	* ) 
 	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; 
 esac
@@@@ -708,7 +710,9 @@@@
 #define HAVE_PERL_DYNALOADER 1
 EOF
 
-        perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a
+	# In Perl 5.8.9, DynaLoader functions are moved to libperl.so,
+	# so we don't need an extra library linked here.
+        perl_dla=
         ;;
     * )
         rc=no
@@@@ -1028,7 +1032,7 @@@@
     CFLAGS="-Wall -g -ggdb3"
     LDFLAGS="-g -ggdb3"
 else
-    CFLAGS="-g"
+#    CFLAGS="-g"
     LDFLAGS="-g"
 fi
 x="enabled"
@@@@ -1039,7 +1043,7 @@@@
 
 
 else
-  CFLAGS=""
+#  CFLAGS=""
 LDFLAGS=""
 x=disabled
 debug=off
@


1.4
log
@- Add support for and unbreak after Perl default version bump to 5.12
- Add support for and fix compilation on Perl 5.14 after a symbol name
  change
- Patch the configure script so PERL_VERSION supplies the Perl version
  number directly, instead of attempting to parse the often-changed
  output of "perl -v"

Reported by:	pointyhat (via erwin & pav)
@
text
@@


1.3
log
@- Unbreak with perl5.10.
- Our minimal perl version is 5.8.9 now, so remove conditional for
  extra-patch-configure.

Approved by:	pav (implicit)
@
text
@d1 3
a3 3
--- configure.orig	1998-08-02 22:48:40.000000000 +0900
+++ configure	2010-02-06 14:30:44.165551147 +0900
@@@@ -571,7 +571,8 @@@@
d8 1
a8 2
+perlvers=`$perlprog -v | grep "This is perl" | sed -e 's/^.* version //' -e 's/^.* v//' -e 's/ built.*//' -e 's/ with.*//'`
+perlvers=`echo ${perlvers} | sed -e 's/ (\*)//'`
d12 10
a21 1
@@@@ -600,7 +601,7 @@@@
d26 1
a26 1
+    5.003* | 5.004* | 5.005* | 5.006* | 5.6.* | 5.8.* | 5.10.* )
d30 1
a30 1
@@@@ -617,6 +618,8 @@@@
d34 1
a34 1
+    5.[68].* | 5.10.* ) 
d39 1
a39 1
@@@@ -708,7 +711,9 @@@@
d50 1
a50 1
@@@@ -1028,7 +1033,7 @@@@
d59 1
a59 1
@@@@ -1039,7 +1044,7 @@@@
@


1.2
log
@Introduce Perl 5.10.0
@
text
@d1 3
a3 3
--- configure
+++ configure
@@@@ -571,7 +571,7 @@@@
d9 1
d13 1
a13 1
@@@@ -600,7 +600,7 @@@@
d22 1
a22 1
@@@@ -617,6 +617,8 @@@@
d31 12
a42 1
@@@@ -1030,7 +1032,7 @@@@
d51 1
a51 1
@@@@ -1041,7 +1043,7 @@@@
@


1.1
log
@- Unbreak by removing reference to DynaLoader.a in Perl 5.8.9+
- Regenerate patch files with "make makepatch"
- Take maintainership
@
text
@d1 2
a2 2
--- ./configure.orig	1998-08-02 09:48:40.000000000 -0400
+++ ./configure	2009-01-29 13:27:30.000000000 -0500
d17 1
a17 1
+    5.003* | 5.004* | 5.005* | 5.006* | 5.6.* | 5.8.* )
d25 1
a25 1
+    5.[68].* ) 
d30 1
a30 1
@@@@ -1028,7 +1030,7 @@@@
d39 1
a39 1
@@@@ -1039,7 +1041,7 @@@@
@

