diff -ruN disorder-1.2/ChangeLog.d/disorder--iwjspecial--0 disorder-1.2+iwjspecial/ChangeLog.d/disorder--iwjspecial--0 --- disorder-1.2/ChangeLog.d/disorder--iwjspecial--0 1970-01-01 01:00:00.000000000 +0100 +++ disorder-1.2+iwjspecial/ChangeLog.d/disorder--iwjspecial--0 2005-05-22 14:10:24.000000000 +0100 @@ -0,0 +1,170 @@ +# do not edit -- automatically generated by arch changelog +# arch-tag: automatic-ChangeLog--rjk@greenend.org.uk--2004/disorder--iwjspecial--0 +# + +2005-05-22 13:10:24 GMT Richard Kettlewell patch-1 + + Summary: + Merged from rjk@greenend.org.uk--2004 (patch 140) + Revision: + disorder--iwjspecial--0--patch-1 + + Version 1.2+iwjspecial. + + Patches applied: + + * rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-140 + check for UTF-8 support in pcre. + + new files: + ChangeLog.d/disorder--iwjspecial--0 + + modified files: + ChangeLog.d/disorder--mainline--0.1 acinclude.m4 configure.ac + + new patches: + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-140 + + +2005-05-22 13:04:29 GMT Richard Kettlewell base-0 + + Summary: + tag of rjk@greenend.org.uk--2004/disorder--release--1.2--base-0 + Revision: + disorder--iwjspecial--0--base-0 + + (automatically generated log message) + + new patches: + rjk@greenend.org.uk--2004/disorder--mainline--0.1--base-0 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-1 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-2 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-3 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-4 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-5 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-6 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-7 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-8 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-9 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-10 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-11 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-12 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-13 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-14 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-15 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-16 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-17 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-18 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-19 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-20 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-21 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-22 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-23 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-24 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-25 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-26 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-27 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-28 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-29 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-30 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-31 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-32 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-33 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-34 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-35 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-36 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-37 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-38 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-39 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-40 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-41 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-42 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-43 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-44 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-45 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-46 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-47 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-48 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-49 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-50 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-51 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-52 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-53 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-54 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-55 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-56 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-57 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-58 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-59 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-60 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-61 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-62 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-63 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-64 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-65 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-66 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-67 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-68 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-69 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-70 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-71 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-72 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-73 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-74 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-75 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-76 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-77 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-78 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-79 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-80 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-81 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-82 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-83 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-84 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-85 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-86 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-87 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-88 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-89 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-90 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-91 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-92 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-93 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-94 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-95 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-96 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-97 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-98 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-99 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-100 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-101 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-102 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-103 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-104 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-105 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-106 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-107 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-108 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-109 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-110 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-111 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-112 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-113 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-114 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-115 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-116 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-117 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-118 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-119 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-120 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-121 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-122 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-123 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-124 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-125 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-126 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-127 + rjk@greenend.org.uk--2004/disorder--mainline--0.1--patch-128 + rjk@greenend.org.uk--2004/disorder--release--1.2--base-0 + + diff -ruN disorder-1.2/ChangeLog.d/disorder--mainline--0.1 disorder-1.2+iwjspecial/ChangeLog.d/disorder--mainline--0.1 --- disorder-1.2/ChangeLog.d/disorder--mainline--0.1 2005-03-11 20:07:38.000000000 +0000 +++ disorder-1.2+iwjspecial/ChangeLog.d/disorder--mainline--0.1 2005-05-22 14:05:08.000000000 +0100 @@ -2,6 +2,20 @@ # arch-tag: automatic-ChangeLog--rjk@greenend.org.uk--2004/disorder--mainline--0.1 # +2005-05-21 17:16:03 GMT Richard Kettlewell patch-140 + + Summary: + check for UTF-8 support in pcre. + Revision: + disorder--mainline--0.1--patch-140 + + * acinclude.m4: new RJK_REQUIRE_PCRE_UTF8 macro checks that PCRE was + built with UTF-8 support. + + modified files: + ChangeLog.d/disorder--mainline--0.1 acinclude.m4 configure.ac + + 2005-03-11 20:07:38 GMT Richard Kettlewell patch-128 Summary: diff -ruN disorder-1.2/acinclude.m4 disorder-1.2+iwjspecial/acinclude.m4 --- disorder-1.2/acinclude.m4 2005-01-02 21:35:36.000000000 +0000 +++ disorder-1.2+iwjspecial/acinclude.m4 2005-05-22 14:05:08.000000000 +0100 @@ -67,4 +67,39 @@ $5 fi ]) + +AC_DEFUN([RJK_REQUIRE_PCRE_UTF8],[ + AC_CACHE_CHECK([whether libpcre was built with UTF-8 support], + [rjk_cv_pcre_utf8],[ + save_LIBS="$LIBS" + LIBS="$LIBS $1" + AC_RUN_IFELSE([AC_LANG_PROGRAM([ + #include + #include + ], + [ + pcre *r; + const char *errptr; + int erroffset; + + r = pcre_compile("\x80\x80", PCRE_UTF8, + &errptr, &erroffset, 0); + if(!r) { + fprintf(stderr, "pcre_compile: %s at %d", + errptr, erroffset); + exit(0); + } else { + fprintf(stderr, "accepted bogus UTF-8 string\n"); + exit(1); + } + ])], + [rjk_cv_pcre_utf8=yes], + [rjk_cv_pcre_utf8=no], + [AC_MSG_ERROR([cross-compiling, cannot check libpcre behaviour])]) + LIBS="$save_LIBS" + ]) + if test $rjk_cv_pcre_utf8 = no; then + AC_MSG_ERROR([please rebuild your pcre library with --enable-utf8]) + fi +]) # arch-tag:d09b2112a218009313949a279401a5b4 diff -ruN disorder-1.2/config.aux/config.guess disorder-1.2+iwjspecial/config.aux/config.guess --- disorder-1.2/config.aux/config.guess 2004-12-24 02:40:32.000000000 +0000 +++ disorder-1.2+iwjspecial/config.aux/config.guess 2005-04-24 21:01:25.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-11-12' +timestamp='2005-04-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -804,6 +804,9 @@ i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit 0 ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit 0 ;; @@ -1137,6 +1140,10 @@ # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit 0 ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos @@ -1197,6 +1204,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; @@ -1413,7 +1423,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -ruN disorder-1.2/config.aux/config.sub disorder-1.2+iwjspecial/config.aux/config.sub --- disorder-1.2/config.aux/config.sub 2004-12-24 02:40:32.000000000 +0000 +++ disorder-1.2+iwjspecial/config.aux/config.sub 2005-04-24 21:01:25.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-11-30' +timestamp='2005-04-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -231,13 +231,14 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -262,7 +263,8 @@ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -298,7 +300,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bs2000-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -310,7 +312,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -336,7 +338,8 @@ | romp-* | rs6000-* \ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ diff -ruN disorder-1.2/config.aux/ltmain.sh disorder-1.2+iwjspecial/config.aux/ltmain.sh --- disorder-1.2/config.aux/ltmain.sh 2005-01-22 15:02:26.000000000 +0000 +++ disorder-1.2+iwjspecial/config.aux/ltmain.sh 2005-04-01 01:47:06.000000000 +0100 @@ -44,7 +44,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool VERSION=1.5.6 -TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 220 $" +TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $" # Check that we have a working $echo. @@ -2945,7 +2945,7 @@ # Check that each of the things are valid numbers. case $current in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2954,7 +2954,7 @@ esac case $revision in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2963,7 +2963,7 @@ esac case $age in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 diff -ruN disorder-1.2/configure disorder-1.2+iwjspecial/configure --- disorder-1.2/configure 2005-03-11 20:00:46.000000000 +0000 +++ disorder-1.2+iwjspecial/configure 2005-05-22 14:06:22.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for disorder 1.2. +# Generated by GNU Autoconf 2.59 for disorder 1.2+iwjspecial. # # Report bugs to . # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='disorder' PACKAGE_TARNAME='disorder' -PACKAGE_VERSION='1.2' -PACKAGE_STRING='disorder 1.2' +PACKAGE_VERSION='1.2+iwjspecial' +PACKAGE_STRING='disorder 1.2+iwjspecial' PACKAGE_BUGREPORT='richard+disorder@sfere.greenend.org.uk' ac_unique_file="progs/disorderd.c" @@ -954,7 +954,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 disorder 1.2 to adapt to many kinds of systems. +\`configure' configures disorder 1.2+iwjspecial to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1020,7 +1020,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of disorder 1.2:";; + short | recursive ) echo "Configuration of disorder 1.2+iwjspecial:";; esac cat <<\_ACEOF @@ -1159,7 +1159,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -disorder configure 1.2 +disorder configure 1.2+iwjspecial generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1173,7 +1173,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by disorder $as_me 1.2, which was +It was created by disorder $as_me 1.2+iwjspecial, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1816,7 +1816,7 @@ # Define the identity of the package. PACKAGE=disorder - VERSION=1.2 + VERSION=1.2+iwjspecial cat >>confdefs.h <<_ACEOF @@ -20387,6 +20387,88 @@ { (exit 1); exit 1; }; } fi +# We require that libpcre support UTF-8 + + echo "$as_me:$LINENO: checking whether libpcre was built with UTF-8 support" >&5 +echo $ECHO_N "checking whether libpcre was built with UTF-8 support... $ECHO_C" >&6 +if test "${rjk_cv_pcre_utf8+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + save_LIBS="$LIBS" + LIBS="$LIBS -lpcre" + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cross-compiling, cannot check libpcre behaviour" >&5 +echo "$as_me: error: cross-compiling, cannot check libpcre behaviour" >&2;} + { (exit 1); exit 1; }; } +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 () +{ + + pcre *r; + const char *errptr; + int erroffset; + + r = pcre_compile("\x80\x80", PCRE_UTF8, + &errptr, &erroffset, 0); + if(!r) { + fprintf(stderr, "pcre_compile: %s at %d", + errptr, erroffset); + exit(0); + } else { + fprintf(stderr, "accepted bogus UTF-8 string\n"); + exit(1); + } + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + rjk_cv_pcre_utf8=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +rjk_cv_pcre_utf8=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + LIBS="$save_LIBS" + +fi +echo "$as_me:$LINENO: result: $rjk_cv_pcre_utf8" >&5 +echo "${ECHO_T}$rjk_cv_pcre_utf8" >&6 + if test $rjk_cv_pcre_utf8 = no; then + { { echo "$as_me:$LINENO: error: please rebuild your pcre library with --enable-utf8" >&5 +echo "$as_me: error: please rebuild your pcre library with --enable-utf8" >&2;} + { (exit 1); exit 1; }; } + fi + + # Checks for header files. echo "$as_me:$LINENO: checking looking for " >&5 @@ -23087,7 +23169,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by disorder $as_me 1.2, which was +This file was extended by disorder $as_me 1.2+iwjspecial, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23150,7 +23232,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -disorder config.status 1.2 +disorder config.status 1.2+iwjspecial configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -ruN disorder-1.2/configure.ac disorder-1.2+iwjspecial/configure.ac --- disorder-1.2/configure.ac 2005-03-11 20:00:09.000000000 +0000 +++ disorder-1.2+iwjspecial/configure.ac 2005-05-22 14:05:53.000000000 +0100 @@ -19,9 +19,9 @@ # USA # -AC_INIT(disorder, 1.2, richard+disorder@sfere.greenend.org.uk) +AC_INIT(disorder, 1.2+iwjspecial, richard+disorder@sfere.greenend.org.uk) AC_CONFIG_AUX_DIR([config.aux]) -AM_INIT_AUTOMAKE(disorder, 1.2) +AM_INIT_AUTOMAKE(disorder, 1.2+iwjspecial) AC_CONFIG_SRCDIR([progs/disorderd.c]) AM_CONFIG_HEADER([config.h]) @@ -96,6 +96,9 @@ AC_MSG_ERROR([missing libraries:$missing_libraries]) fi +# We require that libpcre support UTF-8 +RJK_REQUIRE_PCRE_UTF8([-lpcre]) + # Checks for header files. RJK_FIND_GC_H AC_CHECK_HEADERS([inttypes.h])