Changeset 1167
- Timestamp:
- 12/28/07 19:57:17 (6 months ago)
- Files:
-
- 1.8.3/trunk/CHANGES.182 (modified) (1 diff)
- 1.8.3/trunk/CHANGES.183 (modified) (1 diff)
- 1.8.3/trunk/MANIFEST (modified) (1 diff)
- 1.8.3/trunk/Makefile.in (modified) (2 diffs)
- 1.8.3/trunk/Patchlevel (modified) (1 diff)
- 1.8.3/trunk/aclocal.m4 (modified) (1 diff)
- 1.8.3/trunk/config.h.in (modified) (4 diffs)
- 1.8.3/trunk/configure (modified) (328 diffs)
- 1.8.3/trunk/configure.in (modified) (4 diffs)
- 1.8.3/trunk/confmagic.h (modified) (2 diffs)
- 1.8.3/trunk/game/txt/hlp/penncmd.hlp (modified) (4 diffs)
- 1.8.3/trunk/game/txt/hlp/pennfunc.hlp (modified) (3 diffs)
- 1.8.3/trunk/game/txt/hlp/penntop.hlp (modified) (1 diff)
- 1.8.3/trunk/game/txt/hlp/pennv182.hlp (modified) (1 diff)
- 1.8.3/trunk/game/txt/hlp/pennv183.hlp (modified) (2 diffs)
- 1.8.3/trunk/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
- 1.8.3/trunk/hdrs/ansi.h (modified) (2 diffs)
- 1.8.3/trunk/hdrs/command.h (modified) (3 diffs)
- 1.8.3/trunk/hdrs/externs.h (modified) (2 diffs)
- 1.8.3/trunk/hdrs/mypcre.h (copied) (copied from 1.8.3/branches/devel/hdrs/mypcre.h)
- 1.8.3/trunk/hdrs/mysocket.h (modified) (1 diff)
- 1.8.3/trunk/hdrs/parse.h (modified) (1 diff)
- 1.8.3/trunk/hdrs/pcre.h (deleted)
- 1.8.3/trunk/hdrs/shs.h (modified) (1 diff)
- 1.8.3/trunk/hdrs/strtree.h (modified) (1 diff)
- 1.8.3/trunk/hdrs/version.h (modified) (1 diff)
- 1.8.3/trunk/hints/openbsd.txt (modified) (1 diff)
- 1.8.3/trunk/src/Makefile.in (modified) (75 diffs)
- 1.8.3/trunk/src/access.c (modified) (2 diffs)
- 1.8.3/trunk/src/atr_tab.c (modified) (1 diff)
- 1.8.3/trunk/src/bsd.c (modified) (17 diffs)
- 1.8.3/trunk/src/cmdlocal.dst (modified) (3 diffs)
- 1.8.3/trunk/src/cmds.c (modified) (1 diff)
- 1.8.3/trunk/src/command.c (modified) (26 diffs)
- 1.8.3/trunk/src/conf.c (modified) (1 diff)
- 1.8.3/trunk/src/cque.c (modified) (1 diff)
- 1.8.3/trunk/src/create.c (modified) (1 diff)
- 1.8.3/trunk/src/csrimalloc.c (modified) (1 diff)
- 1.8.3/trunk/src/extchat.c (modified) (5 diffs)
- 1.8.3/trunk/src/extmail.c (modified) (2 diffs)
- 1.8.3/trunk/src/flaglocal.dst (modified) (1 diff)
- 1.8.3/trunk/src/flags.c (modified) (1 diff)
- 1.8.3/trunk/src/funcrypt.c (modified) (1 diff)
- 1.8.3/trunk/src/function.c (modified) (2 diffs)
- 1.8.3/trunk/src/fundb.c (modified) (3 diffs)
- 1.8.3/trunk/src/funlist.c (modified) (19 diffs)
- 1.8.3/trunk/src/funmath.c (modified) (3 diffs)
- 1.8.3/trunk/src/game.c (modified) (4 diffs)
- 1.8.3/trunk/src/help.c (modified) (11 diffs)
- 1.8.3/trunk/src/htmltab.c (modified) (3 diffs)
- 1.8.3/trunk/src/ident.c (modified) (16 diffs)
- 1.8.3/trunk/src/info_master.c (modified) (9 diffs)
- 1.8.3/trunk/src/info_slave.c (modified) (20 diffs)
- 1.8.3/trunk/src/lmathtab.c (modified) (2 diffs)
- 1.8.3/trunk/src/lock.c (modified) (1 diff)
- 1.8.3/trunk/src/log.c (modified) (7 diffs)
- 1.8.3/trunk/src/look.c (modified) (9 diffs)
- 1.8.3/trunk/src/markup.c (modified) (20 diffs)
- 1.8.3/trunk/src/move.c (modified) (3 diffs)
- 1.8.3/trunk/src/myrlimit.c (modified) (2 diffs)
- 1.8.3/trunk/src/mysocket.c (modified) (13 diffs)
- 1.8.3/trunk/src/notify.c (modified) (2 diffs)
- 1.8.3/trunk/src/parse.c (modified) (3 diffs)
- 1.8.3/trunk/src/pcre.c (modified) (3 diffs)
- 1.8.3/trunk/src/set.c (modified) (3 diffs)
- 1.8.3/trunk/src/shs.c (modified) (5 diffs)
- 1.8.3/trunk/src/speech.c (modified) (7 diffs)
- 1.8.3/trunk/src/strtree.c (modified) (2 diffs)
- 1.8.3/trunk/src/strutil.c (modified) (1 diff)
- 1.8.3/trunk/src/timer.c (modified) (2 diffs)
- 1.8.3/trunk/src/wait.c (modified) (3 diffs)
- 1.8.3/trunk/src/wild.c (modified) (7 diffs)
- 1.8.3/trunk/src/wiz.c (modified) (9 diffs)
- 1.8.3/trunk/test/README (added)
- 1.8.3/trunk/test/testmath.pl (modified) (1 diff)
- 1.8.3/trunk/test/testtrim.pl (added)
- 1.8.3/trunk/utils/mkvershlp.pl (modified) (3 diffs)
- 1.8.3/trunk/win32/cmds.h (modified) (1 diff)
- 1.8.3/trunk/win32/confmagic.h (modified) (1 diff)
- 1.8.3/trunk/win32/funs.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
1.8.3/trunk/CHANGES.182
r1160 r1167 14 14 ========================================================================== 15 15 16 Version 1.8.2 patchlevel 8 ??? ??, 200? 17 18 Fixes: 16 Version 1.8.2 patchlevel 8 Jan 01, 2008 17 18 Fixes: 19 20 21 Minor changes: 22 * 'make versions' now provides some feedback. 23 24 Fixes: 25 * width() and height() do not return 0 when set to invalid input. 26 By Talvo. 19 27 * Array underflow bug detected by running under valgrind. 20 28 1.8.3/trunk/CHANGES.183
r1134 r1167 15 15 ========================================================================== 16 16 17 Version 1.8.3 patchlevel 6 ??? ??, 200? 18 19 Fixes: 20 * Compliation fix with some compilers. Reported by Kimiko. 17 Version 1.8.3 patchlevel 6 Jan 01, 2008 18 19 Major changes: 20 * If configure finds a copy of the pcre library installed, that will 21 be used instead of the (old) version bundled with Penn. use 22 --with-pcre=/path/to/it if it's not in the usual places, or 23 --with-pcre=no to force use of the bundled version. 24 25 Minor changes: 26 * @sitelock when there are no rules will now say that instead of 27 having no output. By Talvo. 28 * Log files use locking to prevent the small chance of more than one 29 process writing to the same error log at the same time. 30 * info_slave's logging is more clear as to its source. 31 * Several places that used the select() system call now favor poll() 32 and/or socket timeouts instead. (The main event loop still uses 33 select() for now.) 34 * A wildcard help topic search (help foo*) that only matches one 35 entry will display that entry. Suggested by Cheetah. 36 * New switches for commands no longer have to be added to the 37 SWITCHES file; the internal list of switches is now built based on 38 what switches are given in the command table and cmdlocal.c 39 additions. Suggested by Talek. 40 41 42 Flags and powers: 43 * The announce power now also grants the ability to change the motd. 44 Suggested by Yuriko. 45 * New hook power grants rights to use @hook. Suggested by Paige. 46 * Windows compile fixes by Intrevis. 47 48 Commands: 49 * @motd gives better feedback when clearing a message. 50 * The @tport/@otport/@atport/etc. attributes that get evalulated on a 51 @teleport now get the dbref of the object doing the teleport in %0 52 and the teleported object's old location in %1. Suggested by Daniel 53 Cheng. 54 55 Functions: 56 * root() uses an improved algorithm to give a more precise 57 result. 58 * log(N,2) uses the C log2() function if available. 59 * log(N,e) takes the natural logarithm of N, like ln(). 60 * lports() now takes an optional viewer argument, a la lwho(). By 61 Talvo. 62 63 Fixes: 64 * Typo in info_slave preventing simultaneous hostname lookups fixed. 65 * Compiliation fix with some compilers. Reported by Kimiko. 66 * ident lookups of new connections was broken for several 67 patchlevels. Works again. Sometimes. 68 * Cleaned up some warnings generated by gcc 4.2 69 * Fixed some minor bugs detected by running under valgrind. 70 * OpenBSD configuration fixes. 21 71 22 72 Version 1.8.3 patchlevel 5 October 6, 2007 1.8.3/trunk/MANIFEST
r1117 r1167 112 112 hdrs/oldflags.h 113 113 hdrs/parse.h 114 hdrs/ pcre.h114 hdrs/mypcre.h 115 115 hdrs/privtab.h 116 116 hdrs/ptab.h 1.8.3/trunk/Makefile.in
r1117 r1167 4 4 5 5 VERSION=1.8.3 6 PATCHLEVEL= 56 PATCHLEVEL=6 7 7 8 8 # … … 21 21 SQL_LDFLAGS=@MYSQL_LDFLAGS@ @POSTGRESQL_LDFLAGS@ @SQLITE3_LDFLAGS@ 22 22 23 CCFLAGS=@CFLAGS@ -I.. -I../hdrs 24 LDFLAGS=@LDFLAGS@ 25 CLIBS=@LIBS@ 23 CCFLAGS=@CFLAGS@ -I.. -I../hdrs @PCRE_CFLAGS@ 24 LDFLAGS=@LDFLAGS@ 25 CLIBS=@LIBS@ @PCRE_LIBS@ 26 26 INSTALL=@INSTALL@ 27 27 INSTALLDIR=$installdir 1.8.3/trunk/Patchlevel
r1117 r1167 1 1 Do not edit this file. It is maintained by the official PennMUSH patches. 2 This is PennMUSH 1.8.3p 52 This is PennMUSH 1.8.3p6 1.8.3/trunk/aclocal.m4
r919 r1167 882 882 fi 883 883 ]) 884 ##### http://autoconf-archive.cryp.to/ax_path_lib_pcre.html 885 # 886 # SYNOPSIS 887 # 888 # AX_PATH_LIB_PCRE [(A/NA)] 889 # 890 # DESCRIPTION 891 # 892 # check for pcre lib and set PCRE_LIBS and PCRE_CFLAGS accordingly. 893 # 894 # also provide --with-pcre option that may point to the $prefix of 895 # the pcre installation - the macro will check $pcre/include and 896 # $pcre/lib to contain the necessary files. 897 # 898 # the usual two ACTION-IF-FOUND / ACTION-IF-NOT-FOUND are supported 899 # and they can take advantage of the LIBS/CFLAGS additions. 900 # 901 # LAST MODIFICATION 902 # 903 # 2006-10-13 904 # 905 # COPYLEFT 906 # 907 # Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de> 908 # 909 # This program is free software; you can redistribute it and/or 910 # modify it under the terms of the GNU General Public License as 911 # published by the Free Software Foundation; either version 2 of the 912 # License, or (at your option) any later version. 913 # 914 # This program is distributed in the hope that it will be useful, but 915 # WITHOUT ANY WARRANTY; without even the implied warranty of 916 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 917 # General Public License for more details. 918 # 919 # You should have received a copy of the GNU General Public License 920 # along with this program; if not, write to the Free Software 921 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 922 # 02111-1307, USA. 923 # 924 # As a special exception, the respective Autoconf Macro's copyright 925 # owner gives unlimited permission to copy, distribute and modify the 926 # configure scripts that are the output of Autoconf when processing 927 # the Macro. You need not follow the terms of the GNU General Public 928 # License when using or distributing such scripts, even though 929 # portions of the text of the Macro appear in them. The GNU General 930 # Public License (GPL) does govern all other use of the material that 931 # constitutes the Autoconf Macro. 932 # 933 # This special exception to the GPL applies to versions of the 934 # Autoconf Macro released by the Autoconf Macro Archive. When you 935 # make and distribute a modified version of the Autoconf Macro, you 936 # may extend this special exception to the GPL to apply to your 937 # modified version as well. 938 939 AC_DEFUN([AX_PATH_LIB_PCRE],[dnl 940 AC_MSG_CHECKING([lib pcre]) 941 AC_ARG_WITH(pcre, 942 [ --with-pcre[[=prefix]] path to system pcre],, 943 with_pcre="yes") 944 if test ".$with_pcre" = ".no" ; then 945 AC_MSG_RESULT([disabled]) 946 m4_ifval($2,$2) 947 else 948 AC_MSG_RESULT([(testing)]) 949 AC_CHECK_LIB(pcre, pcre_study) 950 if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then 951 PCRE_LIBS="-lpcre" 952 AC_MSG_CHECKING([lib pcre]) 953 AC_MSG_RESULT([$PCRE_LIBS]) 954 m4_ifval($1,$1) 955 else 956 OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS -L$with_pcre/lib" 957 OLDCPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS -I$with_pcre/include" 958 OLDLIBS="$LIBS" 959 AC_CHECK_LIB(pcre, pcre_compile) 960 CPPFLAGS="$OLDCPPFLAGS" 961 LDFLAGS="$OLDLDFLAGS" 962 LIBS="$OLDLIBS" 963 if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then 964 AC_MSG_RESULT(.setting PCRE_LIBS -L$with_pcre/lib -lpcre) 965 PCRE_LIBS="-L$with_pcre/lib -lpcre" 966 test -d "$with_pcre/include" && PCRE_CFLAGS="-I$with_pcre/include" 967 AC_MSG_CHECKING([lib pcre]) 968 AC_MSG_RESULT([$PCRE_LIBS]) 969 m4_ifval($1,$1) 970 else 971 AC_MSG_CHECKING([lib pcre]) 972 AC_MSG_RESULT([no, (WARNING)]) 973 m4_ifval($2,$2) 974 fi 975 fi 976 fi 977 AC_SUBST([PCRE_LIBS]) 978 AC_SUBST([PCRE_CFLAGS]) 979 ]) 1.8.3/trunk/config.h.in
r1032 r1167 67 67 #undef HAVE_SYS_UIO_H 68 68 69 #undef HAVE_POLL_H 70 71 #undef HAVE_SYS_EPOLL_H 72 73 #undef HAVE_SYS_SELECT_H 74 69 75 /* C99ish headers. The first two are really really nice to have. */ 70 76 … … 88 94 #define HAS_OPENSSL 89 95 #endif 96 97 #undef HAVE_PCRE 90 98 91 99 /* Types */ … … 166 174 #undef HAVE_CBRT 167 175 176 #undef HAVE_LOG2 177 168 178 #undef HAS_CRYPT 169 179 … … 275 285 #undef HAVE_GETPPID 276 286 287 #undef HAVE_PSELECT 288 289 #undef HAVE_POLL 290 291 #undef HAVE_PPOLL 292 293 #undef HAVE_POLLTS 294 277 295 #undef HAVE_KQUEUE 278 296 297 #undef HAVE_EPOLL_CTL 298 279 299 #undef HAVE_VALLOC 280 300 281 301 #undef HAVE_WRITEV 302 303 #undef HAVE_FCNTL 282 304 283 305 /* Variables and defines */ 1.8.3/trunk/configure
r1117 r1167 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 0.3 # Generated by GNU Autoconf 2.61. 4 4 # 5 5 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, … … 11 11 ## --------------------- ## 12 12 13 # Be Bourne compatible 13 # Be more Bourne compatible 14 DUALCASE=1; export DUALCASE # for MKS sh 14 15 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 15 16 emulate sh … … 20 21 setopt NO_GLOB_SUBST 21 22 else 22 case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac 23 fi 24 BIN_SH=xpg4; export BIN_SH # for Tru64 25 DUALCASE=1; export DUALCASE # for MKS sh 23 case `(set -o) 2>/dev/null` in 24 *posix*) set -o posix ;; 25 esac 26 27 fi 28 29 26 30 27 31 … … 216 220 as_candidate_shells= 217 221 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 218 for as_dir in / usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH222 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH 219 223 do 220 224 IFS=$as_save_IFS … … 234 238 if { test -f "$as_shell" || test -f "$as_shell.exe"; } && 235 239 { ("$as_shell") 2> /dev/null <<\_ASEOF 236 # Be Bourne compatible237 240 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 238 241 emulate sh … … 243 246 setopt NO_GLOB_SUBST 244 247 else 245 case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac 246 fi 247 BIN_SH=xpg4; export BIN_SH # for Tru64 248 DUALCASE=1; export DUALCASE # for MKS sh 248 case `(set -o) 2>/dev/null` in 249 *posix*) set -o posix ;; 250 esac 251 252 fi 253 249 254 250 255 : … … 254 259 as_have_required=yes 255 260 if { "$as_shell" 2> /dev/null <<\_ASEOF 256 # Be Bourne compatible257 261 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 258 262 emulate sh … … 263 267 setopt NO_GLOB_SUBST 264 268 else 265 case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac 266 fi 267 BIN_SH=xpg4; export BIN_SH # for Tru64 268 DUALCASE=1; export DUALCASE # for MKS sh 269 case `(set -o) 2>/dev/null` in 270 *posix*) set -o posix ;; 271 esac 272 273 fi 274 269 275 270 276 : … … 513 519 fi 514 520 515 # Find out whether ``test -x'' works. Don't use a zero-byte file, as 516 # systems may use methods other than mode bits to determine executability. 517 cat >conf$$.file <<_ASEOF 518 #! /bin/sh 519 exit 0 520 _ASEOF 521 chmod +x conf$$.file 522 if test -x conf$$.file >/dev/null 2>&1; then 523 as_executable_p="test -x" 524 else 525 as_executable_p=: 526 fi 527 rm -f conf$$.file 521 if test -x / >/dev/null 2>&1; then 522 as_test_x='test -x' 523 else 524 if ls -dL / >/dev/null 2>&1; then 525 as_ls_L_option=L 526 else 527 as_ls_L_option= 528 fi 529 as_test_x=' 530 eval sh -c '\'' 531 if test -d "$1"; then 532 test -d "$1/."; 533 else 534 case $1 in 535 -*)set "./$1";; 536 esac; 537 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in 538 ???[sx]*):;;*)false;;esac;fi 539 '\'' sh 540 ' 541 fi 542 as_executable_p=$as_test_x 528 543 529 544 # Sed expression to map a string onto a valid CPP name. … … 566 581 ac_includes_default="\ 567 582 #include <stdio.h> 568 #if HAVE_SYS_TYPES_H583 #ifdef HAVE_SYS_TYPES_H 569 584 # include <sys/types.h> 570 585 #endif 571 #if HAVE_SYS_STAT_H586 #ifdef HAVE_SYS_STAT_H 572 587 # include <sys/stat.h> 573 588 #endif 574 #if STDC_HEADERS589 #ifdef STDC_HEADERS 575 590 # include <stdlib.h> 576 591 # include <stddef.h> 577 592 #else 578 # if HAVE_STDLIB_H593 # ifdef HAVE_STDLIB_H 579 594 # include <stdlib.h> 580 595 # endif 581 596 #endif 582 #if HAVE_STRING_H583 # if ! STDC_HEADERS &&HAVE_MEMORY_H597 #ifdef HAVE_STRING_H 598 # if !defined STDC_HEADERS && defined HAVE_MEMORY_H 584 599 # include <memory.h> 585 600 # endif 586 601 # include <string.h> 587 602 #endif 588 #if HAVE_STRINGS_H603 #ifdef HAVE_STRINGS_H 589 604 # include <strings.h> 590 605 #endif 591 #if HAVE_INTTYPES_H606 #ifdef HAVE_INTTYPES_H 592 607 # include <inttypes.h> 593 608 #endif 594 #if HAVE_STDINT_H609 #ifdef HAVE_STDINT_H 595 610 # include <stdint.h> 596 611 #endif 597 #if HAVE_UNISTD_H612 #ifdef HAVE_UNISTD_H 598 613 # include <unistd.h> 599 614 #endif" … … 667 682 EGREP 668 683 HAVE_SSL 684 PCRE_LIBS 685 PCRE_CFLAGS 669 686 MYSQL_CONFIG 670 687 MYSQL_VERSION … … 687 704 CFLAGS 688 705 LDFLAGS 706 LIBS 689 707 CPPFLAGS 690 708 SENDMAIL … … 795 813 ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 796 814 # Reject names that are not valid shell variable names. 797 expr "x$ac_feature" : ".*[^- _$as_cr_alnum]" >/dev/null &&815 expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && 798 816 { echo "$as_me: error: invalid feature name: $ac_feature" >&2 799 817 { (exit 1); exit 1; }; } 800 ac_feature=`echo $ac_feature | sed 's/ -/_/g'`818 ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` 801 819 eval enable_$ac_feature=no ;; 802 820 … … 814 832 ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 815 833 # Reject names that are not valid shell variable names. 816 expr "x$ac_feature" : ".*[^- _$as_cr_alnum]" >/dev/null &&834 expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && 817 835 { echo "$as_me: error: invalid feature name: $ac_feature" >&2 818 836 { (exit 1); exit 1; }; } 819 ac_feature=`echo $ac_feature | sed 's/ -/_/g'`837 ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` 820 838 eval enable_$ac_feature=\$ac_optarg ;; 821 839 … … 1011 1029 ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 1012 1030 # Reject names that are not valid shell variable names. 1013 expr "x$ac_package" : ".*[^- _$as_cr_alnum]" >/dev/null &&1031 expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && 1014 1032 { echo "$as_me: error: invalid package name: $ac_package" >&2 1015 1033 { (exit 1); exit 1; }; } 1016 ac_package=`echo $ac_package | sed 's/-/_/g'`1034 ac_package=`echo $ac_package | sed 's/[-.]/_/g'` 1017 1035 eval with_$ac_package=\$ac_optarg ;; 1018 1036 … … 1020 1038 ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` 1021 1039 # Reject names that are not valid shell variable names. 1022 expr "x$ac_package" : ".*[^- _$as_cr_alnum]" >/dev/null &&1040 expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && 1023 1041 { echo "$as_me: error: invalid package name: $ac_package" >&2 1024 1042 { (exit 1); exit 1; }; } 1025 ac_package=`echo $ac_package | sed 's/ -/_/g'`1043 ac_package=`echo $ac_package | sed 's/[-.]/_/g'` 1026 1044 eval with_$ac_package=no ;; 1027 1045 … … 1268 1286 with the default search path) 1269 1287 1288 --with-pcre[=prefix] path to system pcre 1270 1289 --with-mysql=[ARG] use MySQL client library [default=yes], optionally 1271 1290 specify path to mysql_config … … 1280 1299 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a 1281 1300 nonstandard directory <lib dir> 1301 LIBS libraries to pass to the linker, e.g. -l<library> 1282 1302 CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if 1283 1303 you have headers in a nonstandard directory <include dir> … … 1349 1369 cat <<\_ACEOF 1350 1370 configure 1351 generated by GNU Autoconf 2.6 01371 generated by GNU Autoconf 2.61 1352 1372 1353 1373 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, … … 1363 1383 1364 1384 It was created by $as_me, which was 1365 generated by GNU Autoconf 2.6 0. Invocation command line was1385 generated by GNU Autoconf 2.61. Invocation command line was 1366 1386 1367 1387 $ $0 $@ … … 1744 1764 test -z "$as_dir" && as_dir=. 1745 1765 for ac_exec_ext in '' $ac_executable_extensions; do 1746 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_ executable_p"$as_dir/$ac_word$ac_exec_ext"; }; then1766 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1747 1767 ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext" 1748 1768 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 1788 1808 test -z "$as_dir" && as_dir=. 1789 1809 for ac_exec_ext in '' $ac_executable_extensions; do 1790 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_ executable_p"$as_dir/$ac_word$ac_exec_ext"; }; then1810 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1791 1811 ac_cv_prog_CC="${ac_tool_prefix}gcc" 1792 1812 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 1828 1848 test -z "$as_dir" && as_dir=. 1829 1849 for ac_exec_ext in '' $ac_executable_extensions; do 1830 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_ executable_p"$as_dir/$ac_word$ac_exec_ext"; }; then1850 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1831 1851 ac_cv_prog_ac_ct_CC="gcc" 1832 1852 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 1885 1905 test -z "$as_dir" && as_dir=. 1886 1906 for ac_exec_ext in '' $ac_executable_extensions; do 1887 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_ executable_p"$as_dir/$ac_word$ac_exec_ext"; }; then1907 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1888 1908 ac_cv_prog_CC="${ac_tool_prefix}cc" 1889 1909 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 1926 1946 test -z "$as_dir" && as_dir=. 1927 1947 for ac_exec_ext in '' $ac_executable_extensions; do 1928 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_ executable_p"$as_dir/$ac_word$ac_exec_ext"; }; then1948 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1929 1949 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then 1930 1950 ac_prog_rejected=yes … … 1984 2004 test -z "$as_dir" && as_dir=. 1985 2005 for ac_exec_ext in '' $ac_executable_extensions; do 1986 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_ executable_p"$as_dir/$ac_word$ac_exec_ext"; }; then2006 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 1987 2007 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 1988 2008 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 2028 2048 test -z "$as_dir" && as_dir=. 2029 2049 for ac_exec_ext in '' $ac_executable_extensions; do 2030 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_ executable_p"$as_dir/$ac_word$ac_exec_ext"; }; then2050 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2031 2051 ac_cv_prog_ac_ct_CC="$ac_prog" 2032 2052 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 2169 2189 # so that the user can short-circuit this test for compilers unknown to 2170 2190 # Autoconf. 2171 for ac_file in $ac_files 2191 for ac_file in $ac_files '' 2172 2192 do 2173 2193 test -f "$ac_file" || continue … … 2197 2217 2198 2218 else 2219 ac_file='' 2220 fi 2221 2222 { echo "$as_me:$LINENO: result: $ac_file" >&5 2223 echo "${ECHO_T}$ac_file" >&6; } 2224 if test -z "$ac_file"; then 2199 2225 echo "$as_me: failed program was:" >&5 2200 2226 sed 's/^/| /' conftest.$ac_ext >&5 … … 2208 2234 2209 2235 ac_exeext=$ac_cv_exeext 2210 { echo "$as_me:$LINENO: result: $ac_file" >&52211 echo "${ECHO_T}$ac_file" >&6; }2212 2236 2213 2237 # Check that the compiler produces executables we can run. If not, either … … 2387 2411 cat conftest.err >&5 2388 2412 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2389 (exit $ac_status); } && 2390 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2391 { (case "(($ac_try" in 2392 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2393 *) ac_try_echo=$ac_try;; 2394 esac 2395 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2396 (eval "$ac_try") 2>&5 2397 ac_status=$? 2398 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2399 (exit $ac_status); }; } && 2400 { ac_try='test -s conftest.$ac_objext' 2401 { (case "(($ac_try" in 2402 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2403 *) ac_try_echo=$ac_try;; 2404 esac 2405 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2406 (eval "$ac_try") 2>&5 2407 ac_status=$? 2408 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2409 (exit $ac_status); }; }; then 2413 (exit $ac_status); } && { 2414 test -z "$ac_c_werror_flag" || 2415 test ! -s conftest.err 2416 } && test -s conftest.$ac_objext; then 2410 2417 ac_compiler_gnu=yes 2411 2418 else … … 2462 2469 cat conftest.err >&5 2463 2470 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2464 (exit $ac_status); } && 2465 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2466 { (case "(($ac_try" in 2467 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2468 *) ac_try_echo=$ac_try;; 2469 esac 2470 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2471 (eval "$ac_try") 2>&5 2472 ac_status=$? 2473 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2474 (exit $ac_status); }; } && 2475 { ac_try='test -s conftest.$ac_objext' 2476 { (case "(($ac_try" in 2477 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2478 *) ac_try_echo=$ac_try;; 2479 esac 2480 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2481 (eval "$ac_try") 2>&5 2482 ac_status=$? 2483 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2484 (exit $ac_status); }; }; then 2471 (exit $ac_status); } && { 2472 test -z "$ac_c_werror_flag" || 2473 test ! -s conftest.err 2474 } && test -s conftest.$ac_objext; then 2485 2475 ac_cv_prog_cc_g=yes 2486 2476 else … … 2517 2507 cat conftest.err >&5 2518 2508 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2519 (exit $ac_status); } && 2520 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2521 { (case "(($ac_try" in 2522 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2523 *) ac_try_echo=$ac_try;; 2524 esac 2525 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2526 (eval "$ac_try") 2>&5 2527 ac_status=$? 2528 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2529 (exit $ac_status); }; } && 2530 { ac_try='test -s conftest.$ac_objext' 2531 { (case "(($ac_try" in 2532 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2533 *) ac_try_echo=$ac_try;; 2534 esac 2535 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2536 (eval "$ac_try") 2>&5 2537 ac_status=$? 2538 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2539 (exit $ac_status); }; }; then 2509 (exit $ac_status); } && { 2510 test -z "$ac_c_werror_flag" || 2511 test ! -s conftest.err 2512 } && test -s conftest.$ac_objext; then 2540 2513 : 2541 2514 else … … 2573 2546 cat conftest.err >&5 2574 2547 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2575 (exit $ac_status); } && 2576 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2577 { (case "(($ac_try" in 2578 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2579 *) ac_try_echo=$ac_try;; 2580 esac 2581 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2582 (eval "$ac_try") 2>&5 2583 ac_status=$? 2584 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2585 (exit $ac_status); }; } && 2586 { ac_try='test -s conftest.$ac_objext' 2587 { (case "(($ac_try" in 2588 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2589 *) ac_try_echo=$ac_try;; 2590 esac 2591 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2592 (eval "$ac_try") 2>&5 2593 ac_status=$? 2594 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2595 (exit $ac_status); }; }; then 2548 (exit $ac_status); } && { 2549 test -z "$ac_c_werror_flag" || 2550 test ! -s conftest.err 2551 } && test -s conftest.$ac_objext; then 2596 2552 ac_cv_prog_cc_g=yes 2597 2553 else … … 2709 2665 cat conftest.err >&5 2710 2666 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2711 (exit $ac_status); } && 2712 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2713 { (case "(($ac_try" in 2714 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2715 *) ac_try_echo=$ac_try;; 2716 esac 2717 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2718 (eval "$ac_try") 2>&5 2719 ac_status=$? 2720 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2721 (exit $ac_status); }; } && 2722 { ac_try='test -s conftest.$ac_objext' 2723 { (case "(($ac_try" in 2724 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2725 *) ac_try_echo=$ac_try;; 2726 esac 2727 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2728 (eval "$ac_try") 2>&5 2729 ac_status=$? 2730 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2731 (exit $ac_status); }; }; then 2667 (exit $ac_status); } && { 2668 test -z "$ac_c_werror_flag" || 2669 test ! -s conftest.err 2670 } && test -s conftest.$ac_objext; then 2732 2671 ac_cv_prog_cc_c89=$ac_arg 2733 2672 else … … 2785 2724 #include <stdio.h> 2786 2725 2726 // Check varargs macros. These examples are taken from C99 6.10.3.5. 2727 #define debug(...) fprintf (stderr, __VA_ARGS__) 2728 #define showlist(...) puts (#__VA_ARGS__) 2729 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) 2730 static void 2731 test_varargs_macros (void) 2732 { 2733 int x = 1234; 2734 int y = 5678; 2735 debug ("Flag"); 2736 debug ("X = %d\n", x); 2737 showlist (The first, second, and third items.); 2738 report (x>y, "x is %d but y is %d", x, y); 2739 } 2740 2741 // Check long long types. 2742 #define BIG64 18446744073709551615ull 2743 #define BIG32 4294967295ul 2744 #define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) 2745 #if !BIG_OK 2746 your preprocessor is broken; 2747 #endif 2748 #if BIG_OK 2749 #else 2750 your preprocessor is broken; 2751 #endif 2752 static long long int bignum = -9223372036854775807LL; 2753 static unsigned long long int ubignum = BIG64; 2754 2787 2755 struct incomplete_array 2788 2756 { … … 2800 2768 2801 2769 static inline int 2802 test_restrict (ccp restrict text)2770 test_restrict (ccp restrict text) 2803 2771 { 2804 2772 // See if C++-style comments work. … … 2810 2778 } 2811 2779 2812 // Check varargs and va_copy work.2780 // Check varargs and va_copy. 2813 2781 static void 2814 test_varargs (const char *format, ...)2782 test_varargs (const char *format, ...) 2815 2783 { 2816 2784 va_list args; 2817 va_start (args, format);2785 va_start (args, format); 2818 2786 va_list args_copy; 2819 va_copy (args_copy, args);2787 va_copy (args_copy, args); 2820 2788 2821 2789 const char *str; … … 2828 2796 { 2829 2797 case 's': // string 2830 str = va_arg (args_copy, const char *);2798 str = va_arg (args_copy, const char *); 2831 2799 break; 2832 2800 case 'd': // int 2833 number = va_arg (args_copy, int);2801 number = va_arg (args_copy, int); 2834 2802 break; 2835 2803 case 'f': // float 2836 fnumber = (float) va_arg(args_copy, double);2804 fnumber = va_arg (args_copy, double); 2837 2805 break; 2838 2806 default: … … 2840 2808 } 2841 2809 } 2842 va_end (args_copy);2843 va_end (args);2810 va_end (args_copy); 2811 va_end (args); 2844 2812 } 2845 2813 … … 2848 2816 { 2849 2817 2850 // Check bool and long long datatypes.2818 // Check bool. 2851 2819 _Bool success = false; 2852 long long int bignum = -1234567890LL;2853 unsigned long long int ubignum = 1234567890uLL;2854 2820 2855 2821 // Check restrict. 2856 if (test_restrict ("String literal") != 0)2822 if (test_restrict ("String literal") == 0) 2857 2823 success = true; 2858 2824 char *restrict newvar = "Another string"; 2859 2825 2860 2826 // Check varargs. 2861 test_varargs("s, d' f .", "string", 65, 34.234); 2862 2863 // Check incomplete arrays work. 2827 test_varargs ("s, d' f .", "string", 65, 34.234); 2828 test_varargs_macros (); 2829 2830 // Check flexible array members. 2864 2831 struct incomplete_array *ia = 2865 malloc (sizeof(struct incomplete_array) + (sizeof(double) * 10));2832 malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); 2866 2833 ia->datasize = 10; 2867 2834 for (int i = 0; i < ia->datasize; ++i) 2868 ia->data[i] = (double)i * 1.234;2869 2870 // Check named initiali sers.2835 ia->data[i] = i * 1.234; 2836 2837 // Check named initializers. 2871 2838 struct named_init ni = { 2872 2839 .number = 34, … … 2878 2845 2879 2846 int dynamic_array[ni.number]; 2880 dynamic_array[ 43] = 543;2847 dynamic_array[ni.number - 1] = 543; 2881 2848 2882 2849 // work around unused variable warnings 2883 return bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'; 2850 return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' 2851 || dynamic_array[ni.number - 1] != 543); 2884 2852 2885 2853 ; … … 2903 2871 cat conftest.err >&5 2904 2872 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2905 (exit $ac_status); } && 2906 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2907 { (case "(($ac_try" in 2908 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2909 *) ac_try_echo=$ac_try;; 2910 esac 2911 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2912 (eval "$ac_try") 2>&5 2913 ac_status=$? 2914 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2915 (exit $ac_status); }; } && 2916 { ac_try='test -s conftest.$ac_objext' 2917 { (case "(($ac_try" in 2918 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 2919 *) ac_try_echo=$ac_try;; 2920 esac 2921 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 2922 (eval "$ac_try") 2>&5 2923 ac_status=$? 2924 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2925 (exit $ac_status); }; }; then 2873 (exit $ac_status); } && { 2874 test -z "$ac_c_werror_flag" || 2875 test ! -s conftest.err 2876 } && test -s conftest.$ac_objext; then 2926 2877 ac_cv_prog_cc_c99=$ac_arg
