From 1b31b29f35137a69f379b1de3512b3e8703093fb Mon Sep 17 00:00:00 2001 From: nveid Date: Mon, 11 Sep 2006 06:14:49 +0000 Subject: [PATCH] Configure Update --- Configure | 162 ++++++++++++++++++++++--------------------- config_h.SH | 2 +- confmagic.h | 4 +- game/txt/changes.txt | 4 ++ 4 files changed, 88 insertions(+), 84 deletions(-) diff --git a/Configure b/Configure index a3caa25..99b5497 100644 --- a/Configure +++ b/Configure @@ -18,9 +18,9 @@ # you may fetch it yourself from your nearest archive site.) # -# $Id: Configure,v 1.1.1.1 2004-06-06 20:32:51 ari Exp $ +# $Id: Head.U 1.3 Mon, 10 Nov 2003 14:51:32 -0600 dunemush $ # -# Generated on Tue Sep 30 17:54:35 CDT 2003 [metaconfig 3.0 PL70] +# Generated on Mon Sep 11 02:11:00 EDT 2006 [metaconfig 3.0 PL70] cat >/tmp/c1$$ <grimble @@ -1190,7 +1189,7 @@ THIS PACKAGE SEEMS TO BE INCOMPLETE. You have the option of continuing the configuration process, despite the distinct possibility that your kit is damaged, by typing 'y'es. If you do, don't blame me if something goes wrong. I advise you to type 'n'o -and contact the author (dunemush@pennmush.org). +and contact the author (devteam@cobramush.org). EOM echo $n "Continue? [n] $c" >&4 @@ -1244,7 +1243,7 @@ if $needman; then cat </dev/null 2>&1 && \ ./gnulibc | $contains '^GNU C Library' >/dev/null 2>&1; then val="$define" - echo "You are using the GNU C Library" + echo "You are using the GNU C Library" >&4 +else +cat >gnulibc.c < +int main() +{ +#ifdef __GLIBC__ + return 0; +#else + return 1; +#endif +} +EOM +if $cc $ccflags $ldflags -o gnulibc gnulibc.c $libs >/dev/null 2>&1 && \ + ./gnulibc; then + val="$define" + echo "You are using the GNU C Library" >&4 else val="$undef" - echo "You are not using the GNU C Library" + echo "You are not using the GNU C Library" >&4 +fi fi $rm -f gnulibc* set d_gnulibc @@ -4646,9 +4666,13 @@ main() if (-1 == setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val))) exit(2); #ifdef I_NETINET_TCP +#ifdef TCP_KEEPIDLE val = 1; if (-1 == setsockopt(s, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val))) exit(3); +#else + exit(3); +#endif #endif exit(0); } @@ -4898,50 +4922,14 @@ $rm -f open3* : see if we should include -lssl and -lcrypto echo " " -if $test -r /usr/lib/libssl$_a || \ - $test -r /lib/libssl$_a || \ - $test -r /usr/local/lib/libssl$_a ; then - echo "-lssl found." >&4 - libssl='-lssl' -else - xxx=`./loc libssl$_a x $libpth` - case "$xxx" in - x) - echo "No ssl library found." >&4 - libssl='' - ;; - *) - echo "SSL library found in $xxx." >&4 - libssl="$xxx" - ;; - esac -fi - -if $test -r /usr/lib/libcrypto$_a || \ - $test -r /lib/libcrypto$_a || \ - $test -r /usr/local/lib/libcrypto$_a ; then - echo "-lcrypto found." >&4 - libcrypto='-lcrypto' -else - xxx=`./loc libcrypto$_a x $libpth` - case "$xxx" in - x) - echo "No crypto library found." >&4 - libcrypto='' - ;; - *) - echo "SSL crypto library found in $xxx." >&4 - libcrypto="$xxx" - ;; - esac -fi d_openssl="$undef" -case "x$libssl$libcrypto" in - x) - ;; - *) -$cat > test_openssl.c < test_ssl.c < #include #include @@ -4951,27 +4939,30 @@ int main(int argc, char **argv) { } EOM -if $cc $ccflags $ldflags -o test_openssl test_openssl.c $libs $libssl $libcrypto >/dev/null 2>&1 ; -then - echo 'You have openssl...' >&4 - version=`./test_openssl` - if $test $? -eq 0; then - d_openssl="$define" - echo '...and at least version 0.9.6. Great.' >&4 - else - echo '...but not at least version 0.9.6.' >&4 + if $cc $ccflags $ldflags -o test_ssl test_ssl.c $libs $libssl >/dev/null 2>&1 ; + then + echo 'You have openssl...' >&4 + version=`./test_ssl` + if $test $? -eq 0; then + echo '...and at least version 0.9.6. Great.' >&4 + d_openssl="$define" + else + echo '...but not version 0.9.6 or later.' >&4 + libssl='' + fi + else + echo "You don't seem to have openssl." >&4 libssl='' - libcrypto='' - fi + fi + $rm -f test_ssl* core + else - echo "You don't seem to have openssl." >&4 - libssl='' - libcrypto='' + + echo "Skipping openssl tests." >&4 + libssl='' + fi -$rm -f test_openssl* core - ;; -esac : see if rename exists set rename d_rename eval $inlibc @@ -6061,6 +6052,18 @@ esac case "$passcat" in '') passcat='cat /etc/passwd';; esac +case "$hostcat" in +'') hostcat='cat /etc/hosts';; +*) ;; +esac +case "$groupcat" in +'') groupcat='cat /etc/group';; +*) ;; +esac +case "$passcat" in +'') passcat='cat /etc/passwd';; +*) ;; +esac : now get the host name echo " " @@ -6790,10 +6793,10 @@ while test "$cont"; do done : offer to join the mailing list -list_request='pennmush-request@pennmush.org' -list_sub="subscribe" -list_unsub="unsubscribe" -list_name="pennmush" +list_request='' +list_sub="" +list_unsub="" +list_name="" $cat <config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- * that running config_h.SH again will wipe out any changes you've made. * For a more permanent change edit config.sh and rerun config_h.SH. * - * \$Id: config_h.SH,v 1.1.1.1 2004-06-06 20:32:51 ari Exp $ + * \$Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $ */ /* diff --git a/confmagic.h b/confmagic.h index 7672196..a408be1 100644 --- a/confmagic.h +++ b/confmagic.h @@ -6,7 +6,7 @@ * If you wish to get rid of this magic, remove this file and rerun metaconfig * without the -M option. * - * $Id: confmagic.h,v 1.1.1.1 2004-06-06 20:32:51 ari Exp $ + * $Id: Magic_h.U,v 3.0.1.2 1993/11/10 17:32:58 ram Exp $ */ #ifndef _confmagic_h_ @@ -80,7 +80,6 @@ #endif #endif -/* #ifndef HAS_SIGCHLD #define SIGCHLD SIGCLD #endif @@ -88,7 +87,6 @@ #ifndef HAS_SIGCLD #define SIGCLD SIGCHLD #endif -*/ #ifndef HAS_INDEX #ifndef index diff --git a/game/txt/changes.txt b/game/txt/changes.txt index 023fe48..bc05afe 100644 --- a/game/txt/changes.txt +++ b/game/txt/changes.txt @@ -9,6 +9,10 @@ CobraMUSH Version 0.72p1 Version 0.72p1 is a bugfix/maintenance release of version 0.72. It is the first bugfix/maintenance release in that series. + Minor: + * Configure Script updated and rebuilt using base package settings + and variables referencing the CobraMUSH devteam rather than the + PennMUSH devteam. [RLB] Fixes: * Attribute Write Lock was unlocked to everyone by default. [RLB] * Hints for mysql in linux added. Fixes odd cases where mysql -- 2.30.2