diff options
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | include/services.h | 21 | ||||
| -rw-r--r-- | mysql.m4 | 2 | ||||
| -rwxr-xr-x | src/core/configure | 30 | ||||
| -rwxr-xr-x | src/modules/configure | 50 | ||||
| -rwxr-xr-x | src/protocol/configure | 30 | ||||
| -rw-r--r-- | src/protocol/plexus.c | 2 | ||||
| -rw-r--r-- | version.log | 6 |
8 files changed, 106 insertions, 37 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 0e05d7a0b..79547ec53 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -228,7 +228,7 @@ AC_LANG_RESTORE ])dnl ACX_PTHREAD dnl # Configure paths for mysql-client, GPLv2 -dnl #$Id: mysql.m4,v 1.1 2001/10/15 01:48:03 ken Exp $ +dnl #$Id$ dnl #ken restivo modified 2001/08/04 to remove NULLs and use 0, in case NULL undefined. dnl # Markus Fischer <[EMAIL PROTECTED]>, 23.9.1999 dnl # URL : http://josefine.ben.tuwien.ac.at/~mfischer/m4/mysql-client.m4 diff --git a/include/services.h b/include/services.h index c030e7e69..e3c350217 100644 --- a/include/services.h +++ b/include/services.h @@ -33,6 +33,27 @@ # define int32 builtin_int32 #endif +/* Some SUN fixs */ +#ifdef __sun +/* Solaris specific code, types that do not exist in Solaris' + * sys/types.h + **/ +#undef u_int8_t +#undef u_int16_t +#undef u_int32_t +#undef u_int_64_t +#define u_int8_t uint8_t +#define u_int16_t uint16_t +#define u_int32_t uint32_t +#define u_int64_t uint64_t + +#ifndef INADDR_NONE +#define INADDR_NONE (-1) +#endif + +#endif + + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -1,5 +1,5 @@ # Configure paths for mysql-client, GPLv2 -#$Id: mysql.m4,v 1.1 2001/10/15 01:48:03 ken Exp $ +#$Id$ #ken restivo modified 2001/08/04 to remove NULLs and use 0, in case NULL undefined. # Markus Fischer <[EMAIL PROTECTED]>, 23.9.1999 # URL : http://josefine.ben.tuwien.ac.at/~mfischer/m4/mysql-client.m4 diff --git a/src/core/configure b/src/core/configure index 119c7c887..68d2b7713 100755 --- a/src/core/configure +++ b/src/core/configure @@ -1,30 +1,48 @@ #!/bin/sh -echo -n "SRCS=" > ./Makefile.inc +echo2 () { + $ECHO2 "$*$ECHO2SUF" # these are defined later +} + +ECHO2SUF='' +if [ "`echo -n a ; echo -n b`" = "ab" ] ; then + ECHO2='echo -n' +elif [ "`echo 'a\c' ; echo 'b\c'`" = "ab" ] ; then + ECHO2='echo' ; ECHO2SUF='\c' +elif [ "`printf 'a' 2>&1 ; printf 'b' 2>&1`" = "ab" ] ; then + ECHO2='printf "%s"' +else + # oh well... + ECHO2='echo' +fi +export ECHO2 ECHO2SUF + + +echo2 "SRCS=" > ./Makefile.inc FIRST=1 for oldfile in *.c do if [ "$FIRST" = 1 ] ; then - echo -n " "$oldfile >> ./Makefile.inc + echo2 " "$oldfile >> ./Makefile.inc else echo "\\" >> ./Makefile.inc - echo -n " " $oldfile >> ./Makefile.inc + echo2 " " $oldfile >> ./Makefile.inc fi FIRST=0 done echo "" >> ./Makefile.inc -echo -n "SUBS=" >> ./Makefile.inc +echo2 "SUBS=" >> ./Makefile.inc FIRST=1 for dir in * do if [ -d $dir ] ; then if [ -f $dir/Makefile ] ; then if [ "$FIRST" = 1 ] ; then - echo -n " "$dir >> ./Makefile.inc + echo2 " "$dir >> ./Makefile.inc else echo "\\" >> ./Makefile.inc - echo -n " " $dir >> ./Makefile.inc + echo2 " " $dir >> ./Makefile.inc fi FIRST=0 fi diff --git a/src/modules/configure b/src/modules/configure index 4ce3dbd32..68d2b7713 100755 --- a/src/modules/configure +++ b/src/modules/configure @@ -1,42 +1,50 @@ #!/bin/sh -echo -n "SRCS=" > ./Makefile.inc -FIRST=1 +echo2 () { + $ECHO2 "$*$ECHO2SUF" # these are defined later +} -LS=`ls *.c 2>/dev/null | wc -l ` -if [ "0" == "$LS" ] ; then - echo "*** no modules found" +ECHO2SUF='' +if [ "`echo -n a ; echo -n b`" = "ab" ] ; then + ECHO2='echo -n' +elif [ "`echo 'a\c' ; echo 'b\c'`" = "ab" ] ; then + ECHO2='echo' ; ECHO2SUF='\c' +elif [ "`printf 'a' 2>&1 ; printf 'b' 2>&1`" = "ab" ] ; then + ECHO2='printf "%s"' else - for oldfile in *.c - do - if [ "$FIRST" = 1 ] ; then - echo -n " "$oldfile >> ./Makefile.inc - else - echo "\\" >> ./Makefile.inc - echo -n " " $oldfile >> ./Makefile.inc - fi - FIRST=0 - done + # oh well... + ECHO2='echo' fi +export ECHO2 ECHO2SUF + +echo2 "SRCS=" > ./Makefile.inc +FIRST=1 +for oldfile in *.c +do + if [ "$FIRST" = 1 ] ; then + echo2 " "$oldfile >> ./Makefile.inc + else + echo "\\" >> ./Makefile.inc + echo2 " " $oldfile >> ./Makefile.inc + fi + FIRST=0 +done echo "" >> ./Makefile.inc -echo -n "SUBS=" >> ./Makefile.inc +echo2 "SUBS=" >> ./Makefile.inc FIRST=1 for dir in * do if [ -d $dir ] ; then if [ -f $dir/Makefile ] ; then if [ "$FIRST" = 1 ] ; then - echo -n " "$dir >> ./Makefile.inc + echo2 " "$dir >> ./Makefile.inc else echo "\\" >> ./Makefile.inc - echo -n " " $dir >> ./Makefile.inc + echo2 " " $dir >> ./Makefile.inc fi FIRST=0 - if [ -f $dir/configure ] ; then - $dir/configure - fi fi fi done diff --git a/src/protocol/configure b/src/protocol/configure index 119c7c887..68d2b7713 100755 --- a/src/protocol/configure +++ b/src/protocol/configure @@ -1,30 +1,48 @@ #!/bin/sh -echo -n "SRCS=" > ./Makefile.inc +echo2 () { + $ECHO2 "$*$ECHO2SUF" # these are defined later +} + +ECHO2SUF='' +if [ "`echo -n a ; echo -n b`" = "ab" ] ; then + ECHO2='echo -n' +elif [ "`echo 'a\c' ; echo 'b\c'`" = "ab" ] ; then + ECHO2='echo' ; ECHO2SUF='\c' +elif [ "`printf 'a' 2>&1 ; printf 'b' 2>&1`" = "ab" ] ; then + ECHO2='printf "%s"' +else + # oh well... + ECHO2='echo' +fi +export ECHO2 ECHO2SUF + + +echo2 "SRCS=" > ./Makefile.inc FIRST=1 for oldfile in *.c do if [ "$FIRST" = 1 ] ; then - echo -n " "$oldfile >> ./Makefile.inc + echo2 " "$oldfile >> ./Makefile.inc else echo "\\" >> ./Makefile.inc - echo -n " " $oldfile >> ./Makefile.inc + echo2 " " $oldfile >> ./Makefile.inc fi FIRST=0 done echo "" >> ./Makefile.inc -echo -n "SUBS=" >> ./Makefile.inc +echo2 "SUBS=" >> ./Makefile.inc FIRST=1 for dir in * do if [ -d $dir ] ; then if [ -f $dir/Makefile ] ; then if [ "$FIRST" = 1 ] ; then - echo -n " "$dir >> ./Makefile.inc + echo2 " "$dir >> ./Makefile.inc else echo "\\" >> ./Makefile.inc - echo -n " " $dir >> ./Makefile.inc + echo2 " " $dir >> ./Makefile.inc fi FIRST=0 fi diff --git a/src/protocol/plexus.c b/src/protocol/plexus.c index 640126235..32f9feea3 100644 --- a/src/protocol/plexus.c +++ b/src/protocol/plexus.c @@ -1,5 +1,6 @@ /* PlexusIRCD IRCD functions /* PlexusIRCD IRCD functions +/* PlexusIRCD IRCD functions * * (C) 2003-2005 Anope Team * Contact us at info@anope.org @@ -695,7 +696,6 @@ void moduleAddIRCDMsgs(void) { } /* *INDENT-ON* */ - void plexus_cmd_sqline(char *mask, char *reason) { send_cmd(NULL, "RESV * %s :%s", mask, reason); diff --git a/version.log b/version.log index d1c764702..bb3ecd58a 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="9" -VERSION_BUILD="796" +VERSION_BUILD="797" # $Log$ # +# BUILD : 1.7.9 (797) +# BUGS : N/A +# NOTES : Applied some nicities for sun boxs +# # BUILD : 1.7.9 (796) # BUGS : N/A # NOTES : Updated inspircd module to work with inspircd beta 5 and up |